Merge branch 'patches' of git://qemu.weilnetz.de/git/qemu
authorBlue Swirl <blauwirbel@gmail.com>
Fri, 29 Apr 2011 20:01:51 +0000 (20:01 +0000)
committerBlue Swirl <blauwirbel@gmail.com>
Fri, 29 Apr 2011 20:01:51 +0000 (20:01 +0000)
commitb27828881a0f9cee2364544f95e83af1ded6d1cd
tree439c117c5917d9ed5067284e2a4a64982912b45f
parent5eae045e6db8528277ba17d5c256127c6a007670
parent9e950fc4916f8fd61b592f519deb1d22645f19b1
Merge branch 'patches' of git://qemu.weilnetz.de/git/qemu

* 'patches' of git://qemu.weilnetz.de/git/qemu:
  qemu-timer: Fix timers for w32
  qemu-timer: Avoid type casts
  qemu-timer: Remove unneeded include statement (w32)
  qemu-timer: Add and use new function qemu_timer_expired_ns