H. Peter Anvin 68d00bbebb Merge remote-tracking branch 'origin/x86/mm' into x86/mm2 ... Explicitly merging these two branches due to nontrivial conflicts and to allow further work. Resolved Conflicts: arch/x86/kernel/head32.c arch/x86/kernel/head64.c arch/x86/mm/init_64.c arch/x86/realmode/init.c Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>		2013-02-01 02:28:36 -08:00
..
asm	Merge remote-tracking branch 'origin/x86/mm' into x86/mm2	2013-02-01 02:28:36 -08:00
uapi/asm	x86, boot: Define the 2.12 bzImage boot protocol	2013-01-27 15:56:37 -08:00