Merge branch 'x86/asm' into x86/mm

author Ingo Molnar <mingo@elte.hu>

Wed, 25 Feb 2009 07:27:46 +0000 (08:27 +0100)

committer Ingo Molnar <mingo@elte.hu>

Wed, 25 Feb 2009 07:27:46 +0000 (08:27 +0100)
author Ingo Molnar <mingo@elte.hu>
Wed, 25 Feb 2009 07:27:46 +0000 (08:27 +0100)
committer Ingo Molnar <mingo@elte.hu>
Wed, 25 Feb 2009 07:27:46 +0000 (08:27 +0100)
diff --cc arch/x86/kernel/efi_stub_32.S
Simple merge
diff --cc arch/x86/kernel/entry_64.S
Simple merge
author	Ingo Molnar <mingo@elte.hu>
	Wed, 25 Feb 2009 07:27:46 +0000 (08:27 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Wed, 25 Feb 2009 07:27:46 +0000 (08:27 +0100)
		1	2
arch/x86/kernel/efi_stub_32.S	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/entry_64.S	patch \|	diff1 \|	diff2 \|	blob \| history