From: Paolo Bonzini <pbonzini@redhat.com>
Date: Mon, 14 Sep 2015 15:07:35 +0000 (+0200)
Subject: Merge tag 'kvm-arm-for-4.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v4.3-rc2~11^2~10
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=51256484c033a6d57d71aa8f788c24e5dc82348a;p=linux-platform-drivers-x86.git

Merge tag 'kvm-arm-for-4.3-rc2' of git://git.kernel.org/pub/scm/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
---

51256484c033a6d57d71aa8f788c24e5dc82348a