From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 22 Mar 2016 17:39:48 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/mdroth/tags/qga-pull-2016-03-21-tag' into staging
X-Git-Tag: v2.6.0-rc0~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=459621ac1a505ef7dee769295ee2e6c835b2314d;p=thirdparty%2Fqemu.git

Merge remote-tracking branch 'remotes/mdroth/tags/qga-pull-2016-03-21-tag' into staging

qemu-ga patch queue for 2.6

* remove unused variable

# gpg: Signature made Mon 21 Mar 2016 17:32:42 GMT using RSA key ID F108B584
# gpg: Good signature from "Michael Roth <flukshun@gmail.com>"
# gpg:                 aka "Michael Roth <mdroth@utexas.edu>"
# gpg:                 aka "Michael Roth <mdroth@linux.vnet.ibm.com>"

* remotes/mdroth/tags/qga-pull-2016-03-21-tag:
  qemu-ga: drop unused local err variable

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

459621ac1a505ef7dee769295ee2e6c835b2314d