Merge tag 'mvebu-fixes-3.17' of git://git.infradead.org/linux-mvebu into next/fixes...

[linux-2.6-block.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 93e9f730f406a5dcb8c5fa85d689b76b99c06102..3a34ec04a00d65710ee4257a155f762f7a3fabfd 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1361,7 +1361,6 @@ F:        arch/arm/boot/dts/sh*
 F:     arch/arm/configs/ape6evm_defconfig
 F:     arch/arm/configs/armadillo800eva_defconfig
 F:     arch/arm/configs/bockw_defconfig
-F:     arch/arm/configs/genmai_defconfig
 F:     arch/arm/configs/koelsch_defconfig
 F:     arch/arm/configs/kzm9g_defconfig
 F:     arch/arm/configs/lager_defconfig
@@ -9562,6 +9561,14 @@ S:       Maintained
 F:     Documentation/usb/ohci.txt
 F:     drivers/usb/host/ohci*
 
+USB OVER IP DRIVER
+M:     Valentina Manea <valentina.manea.m@gmail.com>
+M:     Shuah Khan <shuah.kh@samsung.com>
+L:     linux-usb@vger.kernel.org
+S:     Maintained
+F:     drivers/usb/usbip/
+F:     tools/usb/usbip/
+
 USB PEGASUS DRIVER
 M:     Petko Manolov <petkan@nucleusys.com>
 L:     linux-usb@vger.kernel.org