Merge ../linux-2.6

1 files changed, 10 insertions, 7 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index f15186032675..b0dc75a5e74e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1524,12 +1524,6 @@ M:	davem@davemloft.net
 L:      linux-kernel@vger.kernel.org
 S:      Maintained
 
-LANMEDIA WAN CARD DRIVER
-P:      Andrew Stanley-Jones
-M:      asj@lanmedia.com
-W:      http://www.lanmedia.com/
-S:      Supported
- 
 LAPB module
 P:      Henner Eisen
 M:      eis@baty.hanse.de
@@ -1752,7 +1746,8 @@ P:	Ralf Baechle
 M:      ralf@linux-mips.org
 W:      http://www.linux-mips.org/
 L:      linux-mips@linux-mips.org
-S:      Maintained
+T:      git www.linux-mips.org:/pub/scm/linux.git
+S:      Supported
 
 MISCELLANEOUS MCA-SUPPORT
 P:      James Bottomley
@@ -2901,6 +2896,14 @@ L:	video4linux-list@redhat.com
 W:      http://www.linux-projects.org
 S:      Maintained
 
+USB ZC0301 DRIVER
+P:      Luca Risolia
+M:      luca.risolia@studio.unibo.it
+L:      linux-usb-devel@lists.sourceforge.net
+L:      video4linux-list@redhat.com
+W:      http://www.linux-projects.org
+S:      Maintained
+
 USB ZD1201 DRIVER
 P:      Jeroen Vreeken
 M:      pe1rxq@amsat.org