From: Blue Swirl <blauwirbel@gmail.com>
Date: Sun, 24 Jun 2012 10:48:01 +0000 (+0000)
Subject: Merge branch 'target-arm.for-upstream' of git://git.linaro.org/people/pmaydell/qemu-arm
X-Git-Tag: qemu-xen-4.3.0-rc1~967
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=959a255dfbe085a47e00fd21c57e87ad4c92719e;p=qemu-upstream-4.6-testing.git

Merge branch 'target-arm.for-upstream' of git://git.linaro.org/people/pmaydell/qemu-arm

* 'target-arm.for-upstream' of git://git.linaro.org/people/pmaydell/qemu-arm: (33 commits)
  target-arm: Remove ARM_CPUID_* macros
  target-arm: Remove remaining old cp15 infrastructure
  target-arm: Move block cache ops to new cp15 framework
  target-arm: Remove c0_cachetype CPUARMState field
  target-arm: Convert final ID registers
  target-arm: Convert MPIDR
  target-arm: Convert cp15 cache ID registers
  target-arm: Convert cp15 crn=0 crm={1,2} feature registers
  target-arm: Convert cp15 crn=1 registers
  target-arm: Convert cp15 crn=9 registers
  target-arm: Convert cp15 crn=6 registers
  target-arm: convert cp15 crn=7 registers
  target-arm: Convert cp15 VA-PA translation registers
  target-arm: Convert cp15 MMU TLB control
  target-arm: Convert cp15 crn=15 registers
  target-arm: Convert cp15 crn=10 registers
  target-arm: Convert cp15 crn=13 registers
  target-arm: Convert cp15 crn=2 registers
  target-arm: Convert MMU fault status cp15 registers
  target-arm: Convert cp15 c3 register
  ...
---

959a255dfbe085a47e00fd21c57e87ad4c92719e