]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5b15f27 5f524c1)
Merge remote-tracking branch 'aneesh/for-upstream-2' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Thu, 25 Aug 2011 12:48:15 +0000 (07:48 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 25 Aug 2011 12:48:15 +0000 (07:48 -0500)

Trivial merge
Qemu copy for testing