| commit | 6da8ae556c11bb3b832dcc0bd077c2d563f5583f | [log] [tgz] |
|---|---|---|
| author | Paolo Bonzini <pbonzini@redhat.com> | Mon Nov 11 11:56:07 2013 +0100 |
| committer | Paolo Bonzini <pbonzini@redhat.com> | Mon Nov 11 12:02:27 2013 +0100 |
| tree | a66ef36fe683e8d2c7507cbf62d18e0a6f175193 | |
| parent | 1b2ca42267fe8c4e909312f2b83dfef882cf6234 [diff] | |
| parent | 79c648806f9034abf54332b78043bb242189d953 [diff] |
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]