Merge branch 'linux-linaro-lsk-v3.14' of https://git.linaro.org/people/shannon.zhao/linux-stable into linux-linaro-lsk-v3.14

Stable v3.14.43 contained an updated backport of KVM into the stable
tree, which conflicted with the previous backport in the LSK v3.14.
This merge combines them.

* 'linux-linaro-lsk-v3.14' of https://git.linaro.org/people/shannon.zhao/linux-stable: (52 commits)
  Linux 3.14.43
  kvm: arm64: vgic: fix hyp panic with 64k pages on juno platform
  arm64: kvm: use inner-shareable barriers for inner-shareable maintenance
  KVM: ARM: vgic: Fix the overlap check action about setting the GICD & GICC base address.
  KVM: arm/arm64: vgic: fix GICD_ICFGR register accesses
  ARM: KVM: trap VM system registers until MMU and caches are ON
  ARM: KVM: add world-switch for AMAIR{0,1}
  ARM: KVM: introduce per-vcpu HYP Configuration Register
  ARM: KVM: fix ordering of 64bit coprocessor accesses
  ARM: KVM: fix handling of trapped 64bit coprocessor accesses
  ARM: KVM: force cache clean on page fault when caches are off
  arm64: KVM: flush VM pages before letting the guest enable caches
  ARM: KVM: introduce kvm_p*d_addr_end
  arm64: KVM: trap VM system registers until MMU and caches are ON
  arm64: KVM: allows discrimination of AArch32 sysreg access
  arm64: KVM: force cache clean on page fault when caches are off
  deal with deadlock in d_walk()
  ACPICA: Utilities: Cleanup to remove useless ACPI_PRINTF/FORMAT_xxx helpers.
  ACPICA: Utilities: Cleanup to convert physical address printing formats.
  ACPICA: Utilities: Cleanup to enforce ACPI_PHYSADDR_TO_PTR()/ACPI_PTR_TO_PHYSADDR().
  ...

0 files changed, 0 insertions, 0 deletions