| commit | 571cfa3eb1ff7223076ed2fdf957b9b174985fbe | |
| author | Jan Kiszka <jan.kiszka@siemens.com> | |
| Mon, 4 Jun 2012 12:54:31 +0000 (4 14:54 +0200) | ||
| committer | Jan Kiszka <jan.kiszka@siemens.com> | |
| Mon, 4 Jun 2012 13:03:45 +0000 (4 15:03 +0200) | ||
| tree | d73a5fe599f4aaf358157cbf9b39a3e59e32faf1 | treesnapshot (tar.gz zip) |
| parent | e15346780809acfb3fc9df4348c97b24654e12f9 | commitdiff |
| parent | 7d37d351dffee60fc7048bbfd8573421f15eb724 | commitdiff |
Merge commit '7d37d351dffee60fc7048bbfd8573421f15eb724' into queues/qemu-merge
Conflicts:
hw/msix.c
hw/msix.h
hw/pci.h
hw/virtio-pci.c
kvm-all.c
kvm-stub.c
kvm.h
Conflicts:
hw/msix.c
hw/msix.h
hw/pci.h
hw/virtio-pci.c
kvm-all.c
kvm-stub.c
kvm.h