Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-20160511-1' into staging

usb: misc fixes

# gpg: Signature made Wed 11 May 2016 12:18:25 BST using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <[email protected]>"
# gpg:                 aka "Gerd Hoffmann <[email protected]>"
# gpg:                 aka "Gerd Hoffmann (private) <[email protected]>"

* remotes/kraxel/tags/pull-usb-20160511-1:
  usb: Support compilation without poll.h
  usb-mtp: fix usb_mtp_get_device_info so that libmtp on the guest doesn't complain
  usb:xhci: no DMA on HC reset

Signed-off-by: Peter Maydell <[email protected]>

diff --git a/VERSION b/VERSION
index f774a71ac5a926b010961901b1f6631068e04214..373c4c9520ce0e886631ed3e84fdb206eb7d1579 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.5.95
+2.6.50