From: Aurelien Jarno Date: Mon, 21 Mar 2011 20:28:38 +0000 (+0100) Subject: Merge branch 'for-anthony' of git://github.com/bonzini/qemu X-Git-Tag: pull-nvme-20200902~10167 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=aa315f95b7c3c5b032cbc6c78f434a871002f558;p=qemu-nvme.git Merge branch 'for-anthony' of git://github.com/bonzini/qemu * 'for-anthony' of git://github.com/bonzini/qemu: remove qemu_get_clock add a generic scaling mechanism for timers change all other clock references to use nanosecond resolution accessors change all rt_clock references to use millisecond resolution accessors add more helper functions with explicit milli/nanosecond resolution --- aa315f95b7c3c5b032cbc6c78f434a871002f558