Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2015-05-09' into...
commit9ad2c8cd41a086020e21aa6d616b73bd5e2a800b
authorPeter Maydell <peter.maydell@linaro.org>
Mon, 11 May 2015 12:54:00 +0000 (11 13:54 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Mon, 11 May 2015 12:54:00 +0000 (11 13:54 +0100)
tree9e53cd27d30f066fb6bebcf0b9cfac5f1347efb1
parentb951cda21d6b232f138ccf008e12bce8ddc95465
parent0caef8f6df4a9426bd6333ab843ce51ce005d7d0
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>
hw/usb/hcd-xhci.c