| commit | eafa61842ce782a87cbd6eb7becfafeea3d0fdcb | |
| author | Jan Kiszka <jan.kiszka@siemens.com> | |
| Tue, 10 Apr 2012 14:15:47 +0000 (10 16:15 +0200) | ||
| committer | Jan Kiszka <jan.kiszka@siemens.com> | |
| Tue, 10 Apr 2012 14:15:47 +0000 (10 16:15 +0200) | ||
| tree | 063bd6dec74f79674a40dceae15100738fdaf18e | treesnapshot (tar.gz zip) |
| parent | 24853eece248d4a58d705c2ddf8818647b11b1e9 | commitdiff |
| parent | d11e859e4afe9b8b12f4478ab4ae3204d2d665ce | commitdiff |
Merge commit 'd11e859e4afe9b8b12f4478ab4ae3204d2d665ce' into queues/qemu-merge
Conflicts:
Makefile.objs
hw/i8254.c
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Conflicts:
Makefile.objs
hw/i8254.c
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
| Makefile.objs | diff1 | diff2 | blobhistory |
| Makefile.target | diff1 | diff2 | blobhistory |
| hw/i8254-kvm.c | diff1 | blobhistory | |
| hw/i8254.c | diff1 | diff2 | blobhistory |
| hw/i8254_common.c | diff2 | blobhistory |