summary refs log tree commit diff stats
path: root/ui/vnc-auth-sasl.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2016-02-02 17:01:56 +0000
committerPeter Maydell <peter.maydell@linaro.org>2016-02-02 17:01:56 +0000
commit3bb1e822ca7c8b48ac80cb7bd53af94c91c949e7 (patch)
treec1bce2f8a57206afc2406a7ab9a603f99ff4bade /ui/vnc-auth-sasl.c
parentd2ea854c382d4d080de1f149167e60290108f79b (diff)
parent5a8660741a8aa19fbf8a5e8a2b3aac88664f4e66 (diff)
downloadfocaccia-qemu-3bb1e822ca7c8b48ac80cb7bd53af94c91c949e7.tar.gz
focaccia-qemu-3bb1e822ca7c8b48ac80cb7bd53af94c91c949e7.zip
Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-20160202-1' into staging
usb: two ehci fixes.

# gpg: Signature made Tue 02 Feb 2016 13:12:00 GMT 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-20160202-1:
  ehci: update irq on reset
  usb: check page select value while processing iTD

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui/vnc-auth-sasl.c')
0 files changed, 0 insertions, 0 deletions