diff options
| author | Peter Maydell | 2016-06-13 16:15:03 +0200 |
|---|---|---|
| committer | Peter Maydell | 2016-06-13 16:15:03 +0200 |
| commit | 2c96c379ac7a22424c25d65b73e81b860f902868 (patch) | |
| tree | cba7cba9fcf3464ebff66430a70ba5f2ada4bbdc /linux-headers/linux/virtio_ring.h | |
| parent | Merge remote-tracking branch 'remotes/berrange/tags/qcrypto-next-2016-06-13-v... (diff) | |
| parent | vl: Eliminate usb_enabled() (diff) | |
| download | qemu-2c96c379ac7a22424c25d65b73e81b860f902868.tar.gz qemu-2c96c379ac7a22424c25d65b73e81b860f902868.tar.xz qemu-2c96c379ac7a22424c25d65b73e81b860f902868.zip | |
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>
Diffstat (limited to 'linux-headers/linux/virtio_ring.h')
0 files changed, 0 insertions, 0 deletions