Merge branch 'mixed-mode' into efi-for-mingo
authorMatt Fleming <matt.fleming@intel.com>
Wed, 5 Mar 2014 18:18:50 +0000 (18:18 +0000)
committerMatt Fleming <matt.fleming@intel.com>
Wed, 5 Mar 2014 18:18:50 +0000 (18:18 +0000)

Trivial merge