]> xenbits.xensource.com Git - qemu-upstream-4.4-testing.git/commitdiff
Merge remote-tracking branch 'origin/master' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 21 Nov 2011 20:36:55 +0000 (14:36 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 21 Nov 2011 20:36:55 +0000 (14:36 -0600)

Trivial merge