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)
commit4fd69331ad227a4d8de26592d017b73e00caca9f
treebfd95ed518ff0cb44318715432d321a92a7b9a0c
parent69e608411473ac56358ef35277563982d0565381
parent0ac09f9f8cd1fb028a48330edba6023d347d3cea
Merge remote-tracking branch 'tip/x86/urgent' into efi-for-mingo

Conflicts:
arch/x86/include/asm/efi.h
arch/x86/include/asm/efi.h
arch/x86/kernel/setup.c
arch/x86/platform/efi/efi.c