git.karo-electronics.de Git - karo-tx-linux.git/commit

]> git.karo-electronics.de Git - karo-tx-linux.git/commit

author	H. Peter Anvin <hpa@linux.intel.com>
	Fri, 1 Feb 2013 10:25:06 +0000 (02:25 -0800)
committer	H. Peter Anvin <hpa@linux.intel.com>
	Fri, 1 Feb 2013 10:28:36 +0000 (02:28 -0800)
commit	68d00bbebb5a48b7a9056a8c03476a71ecbc30a6
tree	95af63041b79c43be37d734da6073fc82070f769	tree \| snapshot
parent	ac2cbab21f318e19bc176a7f38a120cec835220f	commit \| diff
parent	07f4207a305c834f528d08428df4531744e25678	commit \| diff

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>

Linux kernel for KaRo TX COM modules

RSS Atom

arch/x86/include/asm/page.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/pgtable.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/pgtable_types.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/intel.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/setup.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/init_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/pageattr.c	diff1 \|	diff2 \|	blob \| history
arch/x86/platform/efi/efi.c	diff1 \|	diff2 \|	blob \| history
arch/x86/realmode/init.c	diff1 \|	diff2 \|	blob \| history