From: Paolo Bonzini <pbonzini@redhat.com>
Date: Mon, 11 Nov 2013 10:56:07 +0000 (+0100)
Subject: Merge tag 'kvm-arm-for-3.13-3' of git://git.linaro.org/people/cdall/linux-kvm-arm... 
X-Git-Tag: v3.13-rc1~80^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6da8ae556c11bb3b832dcc0bd077c2d563f5583f;p=pandora-kernel.git

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

Updates for KVM/ARM, take 3 supporting more than 4 CPUs.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

Conflicts:
	arch/arm/kvm/reset.c [cpu_reset->reset_regs change; context only]
---

6da8ae556c11bb3b832dcc0bd077c2d563f5583f
Reading git-diff-tree failed