| commit | 9fda9b64c67ba6b87acd485ed25d6f1fa9f233f1 | |
| author | Marcelo Tosatti <mtosatti@redhat.com> | |
| Mon, 18 Oct 2010 17:48:14 +0000 (18 15:48 -0200) | ||
| committer | Marcelo Tosatti <mtosatti@redhat.com> | |
| Mon, 18 Oct 2010 17:48:14 +0000 (18 15:48 -0200) | ||
| tree | 6423025ef197229baeba3347e6d4878c270415f1 | treesnapshot (tar.gz zip) |
| parent | 9d955a47e38d0b479d4670b76da5235d407861a6 | commitdiff |
| parent | 54dd932128ae08d6a5a6668551508e30520b0f86 | commitdiff |
Merge commit '54dd932128ae08d6a5a6668551508e30520b0f86' into upstream-merge
* commit '54dd932128ae08d6a5a6668551508e30520b0f86':
virtio: change set guest notifier to per-device
eepro100: Add support for multiple individual addresses (multiple IA)
Conflicts:
hw/virtio-pci.c
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
* commit '54dd932128ae08d6a5a6668551508e30520b0f86':
virtio: change set guest notifier to per-device
eepro100: Add support for multiple individual addresses (multiple IA)
Conflicts:
hw/virtio-pci.c
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>