Added by Michael S. Tsirkin almost 13 years ago
Merge remote-tracking branch 'origin/master' into pci
Conflicts: hw/virtio-pci.c