From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 11 May 2015 12:54:00 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2015-05-09' into... 
X-Git-Tag: v2.4.0-rc0~141
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9ad2c8cd41a086020e21aa6d616b73bd5e2a800b;p=thirdparty%2Fqemu.git

Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2015-05-09' into staging

trivial patches for 2015-05-09

# gpg: Signature made Fri May  8 22:58:42 2015 BST using RSA key ID A4C3D7DB
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
# gpg:                 aka "Michael Tokarev <mjt@corpit.ru>"
# gpg:                 aka "Michael Tokarev <mjt@debian.org>"

* remotes/mjt/tags/pull-trivial-patches-2015-05-09:
  docs: update BLOCK_IMAGE_CORRUPTED documentation
  glib-compat.h: change assert to g_assert
  Remove various unused functions
  sheepdog: fix resource leak with sd_snapshot_create
  xhci: remove unused code

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

9ad2c8cd41a086020e21aa6d616b73bd5e2a800b