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)
commit5bf692aa91ca32e199173d77f0001274476fe8d7
tree61c0142bd9a3f43aa6f800fcaebc2e1f0ccf5f5b
parent83efeaab3e544151e5019b5cb66eee80932c0036
parentecc921639968a2d70a352af75cf13a390da69749
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