]> xenbits.xensource.com Git - qemu-upstream-4.2-testing.git/commitdiff
Merge remote-tracking branch 'kwolf/block-stable' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Fri, 11 Nov 2011 23:26:37 +0000 (17:26 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Fri, 11 Nov 2011 23:26:37 +0000 (17:26 -0600)

Trivial merge