Merge remote-tracking branch 'tip/x86/efi-mixed' into efi-for-mingo
authorMatt Fleming <matt.fleming@intel.com>
Wed, 5 Mar 2014 18:15:37 +0000 (18:15 +0000)
committerMatt Fleming <matt.fleming@intel.com>
Wed, 5 Mar 2014 18:15:37 +0000 (18:15 +0000)
commit994448f1afa6689bafbebaf7412b23b541b41ef5
treeb7460c6a9bdadc6554ad7f0da52b5c60403164c1
parent4fd69331ad227a4d8de26592d017b73e00caca9f
parent18c46461d9e42d398536055f31f58cdcd2c6347e
Merge remote-tracking branch 'tip/x86/efi-mixed' into efi-for-mingo

Conflicts:
arch/x86/kernel/setup.c
arch/x86/platform/efi/efi.c
arch/x86/platform/efi/efi_64.c
arch/x86/include/asm/efi.h
arch/x86/include/asm/pgtable_types.h
arch/x86/mm/fault.c
arch/x86/mm/pageattr.c
arch/x86/platform/efi/efi.c
arch/x86/platform/efi/efi_64.c
include/linux/efi.h