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)
commit617b3c37da78cb89c63ed880b2405afc7490567b
tree2b625590309c29af7f6f46db9221f3bd7587d834
parent994448f1afa6689bafbebaf7412b23b541b41ef5
parent3db4cafdfd05717dc939780134e53023a3c1f15f
Merge branch 'mixed-mode' into efi-for-mingo