Merge tag 'kvm-arm-for-3.13-1' of git://git.linaro.org/people/cdall/linux-kvm-arm...

author Gleb Natapov <gleb@redhat.com>

Wed, 16 Oct 2013 12:30:32 +0000 (15:30 +0300)

committer Gleb Natapov <gleb@redhat.com>

Wed, 16 Oct 2013 12:30:32 +0000 (15:30 +0300)
author Gleb Natapov <gleb@redhat.com>
Wed, 16 Oct 2013 12:30:32 +0000 (15:30 +0300)
committer Gleb Natapov <gleb@redhat.com>
Wed, 16 Oct 2013 12:30:32 +0000 (15:30 +0300)
diff --cc arch/arm/include/asm/kvm_host.h
Simple merge
diff --cc arch/arm64/include/asm/kvm_host.h
Simple merge
author	Gleb Natapov <gleb@redhat.com>
	Wed, 16 Oct 2013 12:30:32 +0000 (15:30 +0300)
committer	Gleb Natapov <gleb@redhat.com>
	Wed, 16 Oct 2013 12:30:32 +0000 (15:30 +0300)
		1	2
arch/arm/include/asm/kvm_host.h	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm64/include/asm/kvm_host.h	patch \|	diff1 \|	diff2 \|	blob \| history