From: Anthony Liguori <aliguori@us.ibm.com>
Date: Tue, 26 Jun 2012 20:06:09 +0000 (-0500)
Subject: Merge remote-tracking branch 'mdroth/qga-pull-6-21-12' into staging
X-Git-Tag: v1.2.0-rc0~240
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=675658d97e86c42278fc08f8fb4c9531a027b4e7;p=users%2Fdwmw2%2Fqemu.git

Merge remote-tracking branch 'mdroth/qga-pull-6-21-12' into staging

* mdroth/qga-pull-6-21-12:
  qemu-ga: add guest-fstrim command
  qemu-ga: make names more generic for mount list functions
---

675658d97e86c42278fc08f8fb4c9531a027b4e7