]> git.proxmox.com Git - qemu.git/commitdiff
Merge branch 'master' into pci
authorMichael S. Tsirkin <mst@redhat.com>
Mon, 12 Jul 2010 12:13:02 +0000 (15:13 +0300)
committerMichael S. Tsirkin <mst@redhat.com>
Mon, 12 Jul 2010 12:13:02 +0000 (15:13 +0300)

Trivial merge