| commit | 5ef98c785273502fee6092e60a376a1344c3be8b | |
| author | Mark McLoughlin <markmc@redhat.com> | |
| Thu, 8 Oct 2009 13:22:10 +0000 (8 14:22 +0100) | ||
| committer | Mark McLoughlin <markmc@redhat.com> | |
| Thu, 8 Oct 2009 13:22:10 +0000 (8 14:22 +0100) | ||
| tree | 3bc337fa5d8e0773d09d893afd0bc0fe33daebd0 | treesnapshot (tar.gz zip) |
| parent | 219ad804f358d0aec3555f6b060978601885bc7c | commitdiff |
| parent | c59c7ea94796a4fce2fe79b8f9aa3628dc2e0b2a | commitdiff |
Merge commit 'c59c7ea94796a4fce2fe79b8f9aa3628dc2e0b2a'
Conflicts:
hw/pci-hotplug.c
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Conflicts:
hw/pci-hotplug.c
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
| hw/pci-hotplug.c | diff1 | diff2 | blobhistory |
| net.c | diff1 | diff2 | blobhistory |
| net.h | diff1 | diff2 | blobhistory |
| vl.c | diff1 | diff2 | blobhistory |