]> git.proxmox.com Git - qemu.git/commitdiff
Merge remote branch 'mst/pci' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Wed, 17 Mar 2010 14:42:58 +0000 (09:42 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Wed, 17 Mar 2010 14:42:58 +0000 (09:42 -0500)

Trivial merge