commit | b7c8e15a146a7b20021b524f41d6b8072ee093b5 | [log] [tgz] |
---|---|---|
author | Blue Swirl <blauwirbel@gmail.com> | Sat Mar 31 12:10:07 2012 +0000 |
committer | Blue Swirl <blauwirbel@gmail.com> | Sat Mar 31 12:10:07 2012 +0000 |
tree | 538bf55b7f6533f38d0f54ef2e88ffe60f966311 | |
parent | 4dec4654604e7e52964ff0201c46d85d179ed35f [diff] | |
parent | b0f26631bc51790069b0c0b3935b20f9a54e3ab3 [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: pl031: switch clock base to rtc_clock pl031: rearm alarm timer upon load arm: switch real-time clocks to rtc_clock omap: switch omap_lpg to vm_clock rtc: add -rtc clock=rt