Merge remote-tracking branch 'tip/x86/urgent' into efi-for-mingo
authorMatt Fleming <matt.fleming@intel.com>
Wed, 5 Mar 2014 17:22:57 +0000 (17:22 +0000)
committerMatt Fleming <matt.fleming@intel.com>
Wed, 5 Mar 2014 17:31:41 +0000 (17:31 +0000)
Conflicts:
arch/x86/include/asm/efi.h


Trivial merge