| commit | 63d01e8dc4fef18a6924e292c6c28d1c86e37e35 | |
| author | Mark McLoughlin <markmc@redhat.com> | |
| Wed, 28 Oct 2009 11:29:55 +0000 (28 11:29 +0000) | ||
| committer | Mark McLoughlin <markmc@redhat.com> | |
| Wed, 28 Oct 2009 11:29:55 +0000 (28 11:29 +0000) | ||
| tree | 2e85cac2aa8e3a961314754bc581bf3d44829da9 | treesnapshot (tar.gz zip) |
| parent | 9c48b02506ab2f509b998860cf82432a5e7e25ed | commitdiff |
| parent | 9ad4531e1e00b996ba55de04d6ecfb4d02a9fd7c | commitdiff |
Merge commit '9ad4531e1e00b996ba55de04d6ecfb4d02a9fd7c' into upstream-merge
* commit '9ad4531e1e00b996ba55de04d6ecfb4d02a9fd7c':
kill dead nic unplug code.
zap DeviceState->nd
Conflicts:
hw/pci-hotplug.c
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
* commit '9ad4531e1e00b996ba55de04d6ecfb4d02a9fd7c':
kill dead nic unplug code.
zap DeviceState->nd
Conflicts:
hw/pci-hotplug.c
Signed-off-by: Mark McLoughlin <markmc@redhat.com>
| hw/acpi.c | diff1 | diff2 | blobhistory |
| hw/pci-hotplug.c | diff1 | diff2 | blobhistory |
| hw/pci.c | diff1 | diff2 | blobhistory |
| net.h | diff1 | diff2 | blobhistory |
| sysemu.h | diff1 | diff2 | blobhistory |