Merge tag 'kvm-arm-for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm...

author Paolo Bonzini <pbonzini@redhat.com>

Fri, 19 Jun 2015 15:15:24 +0000 (17:15 +0200)

committer Paolo Bonzini <pbonzini@redhat.com>

Fri, 19 Jun 2015 15:15:24 +0000 (17:15 +0200)
author Paolo Bonzini <pbonzini@redhat.com>
Fri, 19 Jun 2015 15:15:24 +0000 (17:15 +0200)
committer Paolo Bonzini <pbonzini@redhat.com>
Fri, 19 Jun 2015 15:15:24 +0000 (17:15 +0200)
diff --cc arch/arm/kvm/mmu.c
Simple merge
diff --cc include/uapi/linux/kvm.h
Simple merge
author	Paolo Bonzini <pbonzini@redhat.com>
	Fri, 19 Jun 2015 15:15:24 +0000 (17:15 +0200)
committer	Paolo Bonzini <pbonzini@redhat.com>
	Fri, 19 Jun 2015 15:15:24 +0000 (17:15 +0200)
		1	2
arch/arm/kvm/mmu.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/uapi/linux/kvm.h	patch \|	diff1 \|	diff2 \|	blob \| history