From: Blue Swirl <blauwirbel@gmail.com>
Date: Sat, 21 Apr 2012 13:33:55 +0000 (+0000)
Subject: Merge branch 'arm-devs.for-upstream' of git://git.linaro.org/people/pmaydell/qemu-arm
X-Git-Tag: TizenStudio_2.0_p2.3.2~208^2~4176^2~16
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=75f05e4fd770d64e5ace1bf8e9bda536903da709;p=sdk%2Femulator%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:
  versatiblepb: add NOR flash support
  hw/arm_mptimer: Reset the qemu_timer at reset
  versatilepb: add ds1338 rtc device
  realview: break out versatile i2c controller code
---

75f05e4fd770d64e5ace1bf8e9bda536903da709