Merge tag 'kvm-arm-for-4.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorPaolo Bonzini <pbonzini@redhat.com>
Mon, 14 Sep 2015 15:07:35 +0000 (17:07 +0200)
committerPaolo Bonzini <pbonzini@redhat.com>
Mon, 14 Sep 2015 15:07:35 +0000 (17:07 +0200)
commit51256484c033a6d57d71aa8f788c24e5dc82348a
treed6ce14cf9d5c1ae9fd6b5aac055d66fad0e1792f
parentedb9272f35d8bc97c86101a13f67d0ba16f3eecc
parent0c0672922dcc70ffba11d96385e98e42fb3ae08d
Merge tag 'kvm-arm-for-4.3-rc2' of git://git./linux/kernel/git/kvmarm/kvmarm into kvm-master

KVM/ARM changes for 4.3-rc2

- Fix timer interrupt injection after the rework
  that went in during the merge window
- Reset the timer to zero on reboot
- Make sure the TCR_EL2 RES1 bits are really set to 1
- Fix a PSCI affinity bug for non-existing vcpus