]> git.proxmox.com Git - qemu.git/commit
Merge branch 'arm-devs.for-upstream' of git://git.linaro.org/people/pmaydell/qemu-arm
authorBlue Swirl <blauwirbel@gmail.com>
Sat, 21 Apr 2012 13:33:55 +0000 (13:33 +0000)
committerBlue Swirl <blauwirbel@gmail.com>
Sat, 21 Apr 2012 13:33:55 +0000 (13:33 +0000)
commit75f05e4fd770d64e5ace1bf8e9bda536903da709
treedcca3ea1abb876b6499f7f0bbbe0032bf25326bf
parentc3ca04679e93a72635d6ef347886dbeba799b2d6
parent964c695a54ceda3ac8c965542829d4e482e28de7
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