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

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

Mon, 12 Nov 2012 02:19:37 +0000 (13:19 +1100)

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

Mon, 12 Nov 2012 02:19:37 +0000 (13:19 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Nov 2012 02:19:37 +0000 (13:19 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Nov 2012 02:19:37 +0000 (13:19 +1100)
diff --cc MAINTAINERS
Simple merge
diff --cc arch/s390/kvm/kvm-s390.c
Simple merge
diff --cc arch/x86/kvm/x86.c
Simple merge
diff --cc include/linux/kvm_host.h
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 12 Nov 2012 02:19:37 +0000 (13:19 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 12 Nov 2012 02:19:37 +0000 (13:19 +1100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/s390/kvm/kvm-s390.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/x86.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/kvm_host.h	patch \|	diff1 \|	diff2 \|	blob \| history