| commit | 0056c2ccddf717e5551b88b9f20c54134804a2f3 | |
| author | Marcelo Tosatti <mtosatti@redhat.com> | |
| Thu, 14 Apr 2011 05:06:27 +0000 (14 02:06 -0300) | ||
| committer | Marcelo Tosatti <mtosatti@redhat.com> | |
| Thu, 14 Apr 2011 05:06:27 +0000 (14 02:06 -0300) | ||
| tree | 89de26c31b2b62b5361f5d501bba981fc1028263 | treesnapshot (tar.gz zip) |
| parent | e24ce62e4aba5d274b604471fe66d1920f8a4ccd | commitdiff |
| parent | 74475455442398a64355428b37422d14ccc293cb | commitdiff |
Merge commit '74475455442398a64355428b37422d14ccc293cb' into upstream-merge
* commit '74475455442398a64355428b37422d14ccc293cb':
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
Fix conversions from pointer to int and vice versa
petalogix_ml605_mmu: remove unused variable
qemu-thread: delete unused functions
w32: Add missing functions qemu_mutex_destroy, qemu_cond_destroy
Conflicts:
hw/i8254.c
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
* commit '74475455442398a64355428b37422d14ccc293cb':
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
Fix conversions from pointer to int and vice versa
petalogix_ml605_mmu: remove unused variable
qemu-thread: delete unused functions
w32: Add missing functions qemu_mutex_destroy, qemu_cond_destroy
Conflicts:
hw/i8254.c
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
12 files changed: