| commit | 9b421939fb38b8e3573e9f04e2a6b38fcb61b09a | |
| author | Marcelo Tosatti <mtosatti@redhat.com> | |
| Thu, 2 Dec 2010 14:03:34 +0000 (2 12:03 -0200) | ||
| committer | Marcelo Tosatti <mtosatti@redhat.com> | |
| Thu, 2 Dec 2010 14:03:34 +0000 (2 12:03 -0200) | ||
| tree | e6c1e59e422c7a5324de13f65e6e1303a91efe88 | treesnapshot (tar.gz zip) |
| parent | f6f8864b9b3ae1ea151c2b781792a5e72baaa178 | commitdiff |
| parent | 4cff0a5994d0300e6e77e90d3354aa517a120539 | commitdiff |
Merge commit '4cff0a5994d0300e6e77e90d3354aa517a120539' into upstream-merge
* commit '4cff0a5994d0300e6e77e90d3354aa517a120539':
pci: allow hotplug removal of cold-plugged devices
PCI: Bus number from the bridge, not the device
e1000: Fix TCP checksum overflow with TSO
tap: make set_offload a nop after netdev cleanup
Add support for async page fault to qemu
tap: clear vhost_net backend on cleanup
more stdvga cleanups.
switch vmware_vga to pci vgabios
switch stdvga to pci vgabios
Conflicts:
hw/acpi_piix4.c
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
* commit '4cff0a5994d0300e6e77e90d3354aa517a120539':
pci: allow hotplug removal of cold-plugged devices
PCI: Bus number from the bridge, not the device
e1000: Fix TCP checksum overflow with TSO
tap: make set_offload a nop after netdev cleanup
Add support for async page fault to qemu
tap: clear vhost_net backend on cleanup
more stdvga cleanups.
switch vmware_vga to pci vgabios
switch stdvga to pci vgabios
Conflicts:
hw/acpi_piix4.c
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
12 files changed: