Matt Fleming 994448f1af 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		2014-03-05 18:15:37 +00:00
..
asm	Merge remote-tracking branch 'tip/x86/efi-mixed' into efi-for-mingo	2014-03-05 18:15:37 +00:00
uapi/asm	Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2014-01-29 18:22:16 -08:00