]> rtime.felk.cvut.cz Git - lisovros/qemu_apohw.git/commitdiff
Merge branch 'target-arm.for-upstream' of git://git.linaro.org/people/pmaydell/qemu-arm
authorBlue Swirl <blauwirbel@gmail.com>
Sat, 28 Jan 2012 13:11:20 +0000 (13:11 +0000)
committerBlue Swirl <blauwirbel@gmail.com>
Sat, 28 Jan 2012 13:11:20 +0000 (13:11 +0000)
* 'target-arm.for-upstream' of git://git.linaro.org/people/pmaydell/qemu-arm:
  Add Cortex-A15 CPU definition
  Add dummy implementation of generic timer cp15 registers
  arm: store the config_base_register during cpu_reset
  target-arm/helper.c: Don't assume softfloat int32 is 32 bits only
  target-arm: Fix implementation of TLB invalidate operations


Trivial merge