commit | 75f05e4fd770d64e5ace1bf8e9bda536903da709 | [log] [tgz] |
---|---|---|
author | Blue Swirl <blauwirbel@gmail.com> | Sat Apr 21 13:33:55 2012 +0000 |
committer | Blue Swirl <blauwirbel@gmail.com> | Sat Apr 21 13:33:55 2012 +0000 |
tree | dcca3ea1abb876b6499f7f0bbbe0032bf25326bf | |
parent | c3ca04679e93a72635d6ef347886dbeba799b2d6 [diff] | |
parent | 964c695a54ceda3ac8c965542829d4e482e28de7 [diff] |
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