From: Aurelien Jarno Date: Thu, 27 Sep 2012 19:48:56 +0000 (+0200) Subject: Merge branch 'arm-devs.for-upstream' of git://git.linaro.org/people/pmaydell/qemu-arm X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=6f8fd2530e9a530f237240daf1c981fa5df7f978;p=qemu.git Merge branch 'arm-devs.for-upstream' of git://git.linaro.org/people/pmaydell/qemu-arm * '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 --- 6f8fd2530e9a530f237240daf1c981fa5df7f978