]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit8345025130ea438d6ee68357909c923b691b2704
treeb7460c6a9bdadc6554ad7f0da52b5c60403164c1
parenteb4f169a71e4ef521ab22a541a7d3c33355dc91a
parentd82d4dfad8363943f04c5b8bc553db2af1b4a8af
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