Merge branch 'tools/kvm'

author Ingo Molnar <mingo@kernel.org>

Mon, 1 Oct 2012 19:09:33 +0000 (21:09 +0200)

committer Ingo Molnar <mingo@kernel.org>

Mon, 1 Oct 2012 19:09:33 +0000 (21:09 +0200)
author Ingo Molnar <mingo@kernel.org>
Mon, 1 Oct 2012 19:09:33 +0000 (21:09 +0200)
committer Ingo Molnar <mingo@kernel.org>
Mon, 1 Oct 2012 19:09:33 +0000 (21:09 +0200)
diff --cc MAINTAINERS
Simple merge
diff --cc arch/x86/Kconfig
Simple merge
diff --cc scripts/kconfig/Makefile
Simple merge
author	Ingo Molnar <mingo@kernel.org>
	Mon, 1 Oct 2012 19:09:33 +0000 (21:09 +0200)
committer	Ingo Molnar <mingo@kernel.org>
	Mon, 1 Oct 2012 19:09:33 +0000 (21:09 +0200)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
scripts/kconfig/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history