--- zzzz-none-000/linux-2.6.19.2/MAINTAINERS	2007-01-10 19:10:37.000000000 +0000
+++ davinci-8020-5505/linux-2.6.19.2/MAINTAINERS	2007-01-11 07:38:19.000000000 +0000
@@ -353,12 +353,6 @@
 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
@@ -499,7 +493,7 @@
 
 BFS FILE SYSTEM
 P:	Tigran A. Aivazian
-M:	tigran@aivazian.fsnet.co.uk
+M:	tigran@veritas.com
 L:	linux-kernel@vger.kernel.org
 S:	Maintained
 
@@ -1519,7 +1513,7 @@
 
 INTEL IA32 MICROCODE UPDATE SUPPORT
 P:	Tigran Aivazian
-M:	tigran@aivazian.fsnet.co.uk
+M:	tigran@veritas.com
 S:	Maintained
 
 INTEL IXP4XX RANDOM NUMBER GENERATOR SUPPORT
@@ -3078,13 +3072,6 @@
 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
@@ -3268,11 +3255,10 @@
 L:	linux-usb-devel@lists.sourceforge.net
 S:	Maintained
 
-USB "USBNET" DRIVER FRAMEWORK
+USB "USBNET" DRIVER
 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