Merge tag 'kvm-arm-for-3.14' of git://git.linaro.org/people/christoffer.dall/linux...

author Paolo Bonzini <pbonzini@redhat.com>

Wed, 15 Jan 2014 11:14:29 +0000 (12:14 +0100)

committer Paolo Bonzini <pbonzini@redhat.com>

Wed, 15 Jan 2014 11:14:29 +0000 (12:14 +0100)
author Paolo Bonzini <pbonzini@redhat.com>
Wed, 15 Jan 2014 11:14:29 +0000 (12:14 +0100)
committer Paolo Bonzini <pbonzini@redhat.com>
Wed, 15 Jan 2014 11:14:29 +0000 (12:14 +0100)
diff --cc Documentation/virtual/kvm/api.txt
Simple merge
diff --cc arch/arm/kvm/arm.c
Simple merge
author	Paolo Bonzini <pbonzini@redhat.com>
	Wed, 15 Jan 2014 11:14:29 +0000 (12:14 +0100)
committer	Paolo Bonzini <pbonzini@redhat.com>
	Wed, 15 Jan 2014 11:14:29 +0000 (12:14 +0100)
		1	2
Documentation/virtual/kvm/api.txt	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/kvm/arm.c	patch \|	diff1 \|	diff2 \|	blob \| history