diff options
| author | Peter Maydell | 2018-06-19 13:58:06 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-06-19 13:58:06 +0200 |
| commit | be33f56c76e5d54d780b402f7777c92103e32419 (patch) | |
| tree | 25e06c65431552a5dbeba4ff237f48ea66c645d4 /include | |
| parent | Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-3.0-20180618' into... (diff) | |
| parent | Revert "bus: do not unref the added child bus on realize" (diff) | |
| download | qemu-be33f56c76e5d54d780b402f7777c92103e32419.tar.gz qemu-be33f56c76e5d54d780b402f7777c92103e32419.tar.xz qemu-be33f56c76e5d54d780b402f7777c92103e32419.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/usb-20180618-pull-request' into staging
usb: revert ccid / qom patches.
# gpg: Signature made Mon 18 Jun 2018 10:21:11 BST
# gpg: using RSA key 4CB6D8EED3E87138
# 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/usb-20180618-pull-request:
Revert "bus: do not unref the added child bus on realize"
Revert "usb: release the created buses"
Revert "usb-ccid: fix bus leak"
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions