| commit | bb9f3dd394dfd3bdac45459e161c34e9b21f0497 | |
| author | Avi Kivity <avi@redhat.com> | |
| Tue, 28 Feb 2012 13:50:47 +0000 (28 15:50 +0200) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Tue, 28 Feb 2012 13:50:47 +0000 (28 15:50 +0200) | ||
| tree | e233ee97c2781df9d30ea0a202f4fc2b38a0e867 | treesnapshot (tar.gz zip) |
| parent | e0a367fb244f38b7232d6078581443d32baa317e | commitdiff |
| parent | b1277b03d46b2aeb22f0829aaa1c0f5fe6dd38fe | commitdiff |
Merge commit 'b1277b03d46b2aeb22f0829aaa1c0f5fe6dd38fe' into upstream-merge
* commit 'b1277b03d46b2aeb22f0829aaa1c0f5fe6dd38fe':
i8254: Factor out interface header
hpet: Save/restore cached RTC IRQ level
Conflicts:
hw/i8254.c
hw/i8254.h
hw/pcspk.c
Signed-off-by: Avi Kivity <avi@redhat.com>
* commit 'b1277b03d46b2aeb22f0829aaa1c0f5fe6dd38fe':
i8254: Factor out interface header
hpet: Save/restore cached RTC IRQ level
Conflicts:
hw/i8254.c
hw/i8254.h
hw/pcspk.c
Signed-off-by: Avi Kivity <avi@redhat.com>
| hw/hpet.c | diff1 | diff2 | blobhistory |
| hw/i8254.h | diff1 | diff2 | blobhistory |
| hw/pc.c | diff1 | diff2 | blobhistory |
| hw/pc.h | diff1 | diff2 | blobhistory |