]> git.proxmox.com Git - qemu.git/commitdiff
Merge remote-tracking branch 'kraxel/usb.89' into staging
authorAnthony Liguori <anthony@codemonkey.ws>
Wed, 11 Sep 2013 19:46:21 +0000 (14:46 -0500)
committerAnthony Liguori <anthony@codemonkey.ws>
Wed, 11 Sep 2013 19:46:21 +0000 (14:46 -0500)
# By Gerd Hoffmann (2) and Miroslav Rezanina (2)
# Via Gerd Hoffmann
* kraxel/usb.89:
  ehci: save device pointer in EHCIState
  Remove dev-bluetooth.c dependency from vl.c
  Preparation for usb-bt-dongle conditional build
  usb: sanity check setup_index+setup_len in post_load

Message-id: 1378806073-25197-1-git-send-email-kraxel@redhat.com
Signed-off-by: Anthony Liguori <anthony@codemonkey.ws>

Trivial merge