From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 13 Jun 2016 14:15:03 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-20160613-1' into staging
X-Git-Tag: pull-nvme-20200902~3298
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=2c96c379ac7a22424c25d65b73e81b860f902868;p=qemu-nvme.git

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

usb: misc fixes.

# gpg: Signature made Mon 13 Jun 2016 14:09:15 BST
# gpg:                using RSA key 0x4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/pull-usb-20160613-1:
  vl: Eliminate usb_enabled()
  pxa2xx: Unconditionally enable USB controller
  hw/usb/dev-network.c: Use ldl_le_p() and stl_le_p()
  usb-host: add special case for bus+addr

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

2c96c379ac7a22424c25d65b73e81b860f902868