Merge branch 'arm-devs.for-upstream' of git://git.linaro.org/people/pmaydell/qemu-arm
authorAurelien Jarno <aurelien@aurel32.net>
Thu, 27 Sep 2012 19:48:56 +0000 (21:48 +0200)
committerAurelien Jarno <aurelien@aurel32.net>
Thu, 27 Sep 2012 19:48:56 +0000 (21:48 +0200)
* 'arm-devs.for-upstream' of git://git.linaro.org/people/pmaydell/qemu-arm:
  Versatile Express: Add modelling of NOR flash
  Versatile Express: Fix NOR flash 0 address and remove flash alias
  hw/armv7m_nvic: Correctly register GIC region when setting up NVIC
  pl190: fix read of VECTADDR


Trivial merge