]> rtime.felk.cvut.cz Git - lisovros/qemu_apohw.git/commit
Merge branch 'for-anthony' of git://github.com/bonzini/qemu
authorAurelien Jarno <aurelien@aurel32.net>
Mon, 21 Mar 2011 20:28:38 +0000 (21:28 +0100)
committerAurelien Jarno <aurelien@aurel32.net>
Mon, 21 Mar 2011 20:28:38 +0000 (21:28 +0100)
commitaa315f95b7c3c5b032cbc6c78f434a871002f558
tree61c0142bd9a3f43aa6f800fcaebc2e1f0ccf5f5b
parent32465727627711ff3e1cde6777a014413c3cb9ee
parent6d5ad9bf9318b1555d5567cd7e1760a51a55ebf8
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
hw/arm_sysctl.c
hw/ide/core.c
savevm.c