Merge tag 'kvm-for-3.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm...

author Paolo Bonzini <pbonzini@redhat.com>

Tue, 4 Mar 2014 14:58:00 +0000 (15:58 +0100)

committer Paolo Bonzini <pbonzini@redhat.com>

Tue, 4 Mar 2014 14:58:00 +0000 (15:58 +0100)
author Paolo Bonzini <pbonzini@redhat.com>
Tue, 4 Mar 2014 14:58:00 +0000 (15:58 +0100)
committer Paolo Bonzini <pbonzini@redhat.com>
Tue, 4 Mar 2014 14:58:00 +0000 (15:58 +0100)
diff --cc arch/x86/kvm/mmu.c
Simple merge
diff --cc arch/x86/kvm/x86.c
Simple merge
author	Paolo Bonzini <pbonzini@redhat.com>
	Tue, 4 Mar 2014 14:58:00 +0000 (15:58 +0100)
committer	Paolo Bonzini <pbonzini@redhat.com>
	Tue, 4 Mar 2014 14:58:00 +0000 (15:58 +0100)
		1	2
arch/x86/kvm/mmu.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/kvm/x86.c	patch \|	diff1 \|	diff2 \|	blob \| history