arch/arm/kvm/reset.c · 6da8ae556c11bb3b832dcc0bd077c2d563f5583f · Kirill Smelkov / linux

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

Paolo Bonzini authored Nov 11, 2013

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]

6da8ae55

reset.c 2.33 KB

Replace reset.c