diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-02-29 12:24:26 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-02-29 12:24:26 +0000 |
| commit | 071608b519adf62bc29c914343a21c5407ab1ac9 (patch) | |
| tree | fc0f15669962407e44ea551f870f48dc7f5e09f1 /MAINTAINERS | |
| parent | 1da90c34c9e76e0f4fa9faaa670518443b9bda9c (diff) | |
| parent | e8ce12d9eaeedeb7f8d9debcd4c9b993903f1abb (diff) | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-20160229-1' into staging
usb: redirect bugfix, MAINTAINERS update.
# gpg: Signature made Mon 29 Feb 2016 11:09:54 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-20160229-1:
usb-redirect: Avoid double free of data
MAINTAINERS: Add some missing entries for USB related files
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 09cc19cf47..a5853cd7b6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -857,6 +857,10 @@ M: Gerd Hoffmann <kraxel@redhat.com> S: Maintained F: hw/usb/* F: tests/usb-*-test.c +F: docs/usb2.txt +F: docs/usb-storage.txt +F: include/hw/usb.h +F: include/hw/usb/ USB (serial adapter) M: Gerd Hoffmann <kraxel@redhat.com> |