tree a66ef36fe683e8d2c7507cbf62d18e0a6f175193
parent 1b2ca42267fe8c4e909312f2b83dfef882cf6234
parent 79c648806f9034abf54332b78043bb242189d953
author Paolo Bonzini <pbonzini@redhat.com> 1384167367 +0100
committer Paolo Bonzini <pbonzini@redhat.com> 1384167747 +0100
mergetag object 79c648806f9034abf54332b78043bb242189d953
 type commit
 tag kvm-arm-for-3.13-3
 tagger Christoffer Dall <christoffer.dall@linaro.org> 1383873898 -0800
 
 Updates for KVM/ARM, take 3 supporting more than 4 CPUs.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQEcBAABAgAGBQJSfD2NAAoJEEtpOizt6ddyK0IH+wQf6Hwe2nLAhj86knqDHsPt
 LgJ6ZSY2bhWTKhCVDkH4HQt6ZqWEV7P8HsLNLc9FxjxCIgGO6Lp6Obv6sYscZrvh
 OdzsZ/+j1t035qmeLwBJnB2x+j21ACd5LYVaWkfJPmGJ40KrcgP/t3fj3r1le91Z
 jUM5BZY8fbEpJ1JaLoYZIEm1nYQJ4cabkqb9dFieqbVB1OoYw5W7KCV0wazOpg+f
 T2WL8Dy+lP8DfGRrEjsIM299DlMAFfUCj7mgfO3yTDUK0Q6Q3ZN7f394c+04OfZv
 /V1fM4y4X1i/2wlL3oPaf1WtYhwd2VxJwo1n3SLg1b9gWghYnqUR/vBHrUmzX/A=
 =2ESp
 -----END PGP SIGNATURE-----

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]