Merge remote-tracking branch 'kvm/linux-next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Mon, 6 Jan 2014 07:23:49 +0000 (18:23 +1100)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Mon, 6 Jan 2014 07:23:49 +0000 (18:23 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 6 Jan 2014 07:23:49 +0000 (18:23 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 6 Jan 2014 07:23:49 +0000 (18:23 +1100)
diff --cc MAINTAINERS
Simple merge
diff --cc arch/powerpc/kvm/book3s_hv.c
Simple merge
diff --cc arch/x86/kvm/vmx.c
Simple merge
diff --cc arch/x86/kvm/x86.c
Simple merge
diff --cc virt/kvm/kvm_main.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 6 Jan 2014 07:23:49 +0000 (18:23 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 6 Jan 2014 07:23:49 +0000 (18:23 +1100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kvm/book3s_hv.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/vmx.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/x86.c	patch \|	diff1 \|	diff2 \|	blob \| history
virt/kvm/kvm_main.c	patch \|	diff1 \|	diff2 \|	blob \| history