Merge commit 'aba800a3ffdffd9484d458344bfea8886e9062d2' into upstream-merge
commit6ed492e81732c6e9271920bdc925de0ae41e56c6
authorAvi Kivity <avi@redhat.com>
Tue, 30 Jun 2009 09:40:14 +0000 (30 12:40 +0300)
committerAvi Kivity <avi@redhat.com>
Tue, 30 Jun 2009 09:40:14 +0000 (30 12:40 +0300)
tree7097962bd03bf43f9049105b1e1811a72eb23e80
parent42c053a80e487c3fc705facdcdcee31613a0075c
parentaba800a3ffdffd9484d458344bfea8886e9062d2
Merge commit 'aba800a3ffdffd9484d458344bfea8886e9062d2' into upstream-merge

* commit 'aba800a3ffdffd9484d458344bfea8886e9062d2':
  qemu/virtio: MSI-X support in virtio PCI

Signed-off-by: Avi Kivity <avi@redhat.com>