diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-05-06 13:06:32 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-05-06 13:06:32 +0100 |
| commit | 951916d02c59cd0eddd57c3d66f87f921931e394 (patch) | |
| tree | cdf31204dc21083e8330a7f9a7b5c5e1a221e644 /hw/i386/smbios.c | |
| parent | 9898370497da3f18e0c9555b65c858eabc78ab50 (diff) | |
| parent | 8ebb87635790e7033e19e9a26e8c5eef22560bcc (diff) | |
| download | qemu-951916d02c59cd0eddd57c3d66f87f921931e394.zip qemu-951916d02c59cd0eddd57c3d66f87f921931e394.tar.gz qemu-951916d02c59cd0eddd57c3d66f87f921931e394.tar.bz2 | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-6' into staging
ohci live migration.
mtp bugfixes.
# gpg: Signature made Mon 05 May 2014 12:08:48 BST using RSA key ID D3E87138
# 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>"
* remotes/kraxel/tags/pull-usb-6:
usb: mtp: reply INCOMPLETE_TRANSFER on read errors
usb: mtp: fix possible buffer overflow
usb: mtp: drop data-out hexdump
usb: mtp: avoid empty description string
usb: mtp: fix error path memory leak
usb: mtp: fix serial (must be exact 32 chars)
usb: mtp: fix version (is decimal not bcd)
usb: mtp: fix usb_mtp_add_u64
usb: mtp: replace debug printfs with trace points
usb-ohci: Add vmstate descriptor
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/i386/smbios.c')
0 files changed, 0 insertions, 0 deletions