diff --git a/[refs] b/[refs] index ef9b09aa9057..e6f585334d7c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 87abd0a92c72eea71542d6c972c67e39e584e989 +refs/heads/master: 857aab34f04ff86666aa80e751ee696eff0113dd diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 4307673415f7..1f93f5084d26 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -6462,6 +6462,12 @@ S: Maintained F: Documentation/usb/hiddev.txt F: drivers/hid/usbhid/ +USB/IP DRIVERS +M: Matt Mooney +L: linux-usb@vger.kernel.org +S: Maintained +F: drivers/staging/usbip/ + USB ISP116X DRIVER M: Olav Kongas L: linux-usb@vger.kernel.org