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)
commit57577241291834bf5569c6e4d1b2515937848eea
tree9ee42d082f17ebb559a69e90a3e7c3f0fa6cad54
parent4923e399138540a6305e80979648678eab1f0f12
parent5f937042db28b7bd047005e78bcb14f91fd6aab0
Merge remote branch 'origin/master' into pci