tree dcca3ea1abb876b6499f7f0bbbe0032bf25326bf
parent c3ca04679e93a72635d6ef347886dbeba799b2d6
parent 964c695a54ceda3ac8c965542829d4e482e28de7
author Blue Swirl <blauwirbel@gmail.com> 1335015235 +0000
committer Blue Swirl <blauwirbel@gmail.com> 1335015235 +0000

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