]> git.proxmox.com Git - mirror_qemu.git/commit
Merge remote branch 'origin/master' into pci
authorMichael S. Tsirkin <mst@redhat.com>
Wed, 12 Jan 2011 15:39:36 +0000 (17:39 +0200)
committerMichael S. Tsirkin <mst@redhat.com>
Wed, 12 Jan 2011 15:39:36 +0000 (17:39 +0200)
commitc2e08bddcd1fa32415c0ee5aa6d3c88a258db4c0
tree9ee42d082f17ebb559a69e90a3e7c3f0fa6cad54
parentb36e391441906c36ed0856b69de84001860402bf
parent05bf441eb69a813d3893174d54faa6afa8c0d39b
Merge remote branch 'origin/master' into pci