Merge branch 'x86/build'

author Ingo Molnar <mingo@kernel.org>

Tue, 19 Feb 2013 07:45:45 +0000 (08:45 +0100)

committer Ingo Molnar <mingo@kernel.org>

Tue, 19 Feb 2013 07:45:45 +0000 (08:45 +0100)
author Ingo Molnar <mingo@kernel.org>
Tue, 19 Feb 2013 07:45:45 +0000 (08:45 +0100)
committer Ingo Molnar <mingo@kernel.org>
Tue, 19 Feb 2013 07:45:45 +0000 (08:45 +0100)
diff --cc Makefile
Simple merge
diff --cc arch/x86/Kconfig
Simple merge
diff --cc arch/x86/Makefile
Simple merge
author	Ingo Molnar <mingo@kernel.org>
	Tue, 19 Feb 2013 07:45:45 +0000 (08:45 +0100)
committer	Ingo Molnar <mingo@kernel.org>
	Tue, 19 Feb 2013 07:45:45 +0000 (08:45 +0100)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history