Merge branch 'tools/kvm'

author Ingo Molnar <mingo@kernel.org>

Tue, 24 Jul 2012 12:02:16 +0000 (14:02 +0200)

committer Ingo Molnar <mingo@kernel.org>

Tue, 24 Jul 2012 12:02:16 +0000 (14:02 +0200)
author Ingo Molnar <mingo@kernel.org>
Tue, 24 Jul 2012 12:02:16 +0000 (14:02 +0200)
committer Ingo Molnar <mingo@kernel.org>
Tue, 24 Jul 2012 12:02:16 +0000 (14:02 +0200)
diff --cc MAINTAINERS
Simple merge
diff --cc arch/x86/Kconfig
Simple merge
author	Ingo Molnar <mingo@kernel.org>
	Tue, 24 Jul 2012 12:02:16 +0000 (14:02 +0200)
committer	Ingo Molnar <mingo@kernel.org>
	Tue, 24 Jul 2012 12:02:16 +0000 (14:02 +0200)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history