From: Blue Swirl Date: Sat, 31 Mar 2012 12:10:07 +0000 (+0000) Subject: Merge branch 'arm-devs.for-upstream' of git://git.linaro.org/people/pmaydell/qemu-arm X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b7c8e15a146a7b20021b524f41d6b8072ee093b5;p=qemu.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: 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 --- b7c8e15a146a7b20021b524f41d6b8072ee093b5