Merge tag 'kvm-arm-for-3.13-3' of git://git.linaro.org/people/cdall/linux-kvm-arm...
authorPaolo Bonzini <pbonzini@redhat.com>
Mon, 11 Nov 2013 10:56:07 +0000 (11:56 +0100)
committerPaolo Bonzini <pbonzini@redhat.com>
Mon, 11 Nov 2013 11:02:27 +0000 (12:02 +0100)
commit6da8ae556c11bb3b832dcc0bd077c2d563f5583f
treea66ef36fe683e8d2c7507cbf62d18e0a6f175193
parent1b2ca42267fe8c4e909312f2b83dfef882cf6234
parent79c648806f9034abf54332b78043bb242189d953
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]
arch/arm/kvm/reset.c