From: Blue Swirl <blauwirbel@gmail.com>
Date: Sat, 7 Jul 2012 09:00:38 +0000 (+0000)
Subject: Merge branch 'arm-devs.for-upstream' of git://git.linaro.org/people/pmaydell/qemu-arm
X-Git-Tag: v1.2.0-rc0~198
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=fa73f99119f939b8816c889f9a83710d3a74a36a;p=users%2Fdwmw2%2Fqemu.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:
  hw/cadence_gem: Make rx_desc_addr and tx_desc_addr uint32_t
  i.MX31: KZM-ARM11-01 evaluation board
  i.MX31: Interrupt Controller
  i.MX31: Timers
  i.MX31: Clock Control Module
  i.MX: UART support
  Exynos4: add RTC device
  hw/exynos4210.c: Fix misleading initialization of IROM mirror
  hw/exynos4210_pwm.c: Fix STOP status in tick handler.
  ARM: hw/exynos4210_mct.c: Fix a bug which hangs Linux kernel.
---

fa73f99119f939b8816c889f9a83710d3a74a36a