]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3978f46 eab5fd5)
Merge remote-tracking branch 'mdroth/qga-pull-6-21-12' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 26 Jun 2012 20:06:09 +0000 (15:06 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 26 Jun 2012 20:06:09 +0000 (15:06 -0500)
* mdroth/qga-pull-6-21-12:
  qemu-ga: add guest-fstrim command
  qemu-ga: make names more generic for mount list functions


Trivial merge
Qemu copy for testing