Matt Fleming 4fd69331ad Merge remote-tracking branch 'tip/x86/urgent' into efi-for-mingo ... Conflicts: arch/x86/include/asm/efi.h		2014-03-05 17:31:41 +00:00
..
asm	Merge remote-tracking branch 'tip/x86/urgent' into efi-for-mingo	2014-03-05 17:31:41 +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