[ARM] Merge individual ARM sub-trees

[karo-tx-linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 8732daeae3038328772e410d951cceb85bae1731..deae37416eec161ed98ea4c515cc3fa5b520855d 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -348,11 +348,24 @@ P:        Ian Molton
 M:     spyro@f2s.com
 S:     Maintained
 
+ARM/ATMEL AT91RM9200 ARM ARCHITECTURE
+P:      Andrew Victor
+M:      andrew@sanpeople.com
+L:      linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+W:      http://maxim.org.za/at91_26.html
+S:      Maintained
+
 ARM/CORGI MACHINE SUPPORT
 P:     Richard Purdie
 M:     rpurdie@rpsys.net
 S:     Maintained
 
+ARM/HP JORNADA 7XX MACHINE SUPPORT
+P:      Kristoffer Ericson
+M:      kristoffer_e1@hotmail.com
+W:      www.jlime.com
+S:      Maintained
+
 ARM/TOSA MACHINE SUPPORT
 P:     Dirk Opfer
 M:     dirk@opfer-online.de
@@ -3072,6 +3085,13 @@ L:       video4linux-list@redhat.com
 W:     http://www.linux-projects.org
 S:     Maintained
 
+USB GADGET/PERIPHERAL SUBSYSTEM
+P:     David Brownell
+M:     dbrownell@users.sourceforge.net
+L:     linux-usb-devel@lists.sourceforge.net
+W:     http://www.linux-usb.org/gadget
+S:     Maintained
+
 USB HID/HIDBP DRIVERS
 P:     Vojtech Pavlik
 M:     vojtech@suse.cz
@@ -3255,10 +3275,11 @@ L:      linux-usb-users@lists.sourceforge.net
 L:     linux-usb-devel@lists.sourceforge.net
 S:     Maintained
 
-USB "USBNET" DRIVER
+USB "USBNET" DRIVER FRAMEWORK
 P:     David Brownell
 M:     dbrownell@users.sourceforge.net
 L:     linux-usb-devel@lists.sourceforge.net
+W:     http://www.linux-usb.org/usbnet
 S:     Maintained
 
 USB W996[87]CF DRIVER