[POWERPC] Fix a compiler warning in mm/tlb_64.c

[karo-tx-linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 7e5a7ff2a86c85886e1c638b4744aaf1d43210e9..196a31c97524eac2ee9fc5235cb1e92f38ca5c7a 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -861,6 +861,8 @@ S:  Maintained
 DOCBOOK FOR DOCUMENTATION
 P:     Martin Waitz
 M:     tali@admingilde.org
+P:     Randy Dunlap
+M:     rdunlap@xenotime.net
 T:     git http://tali.admingilde.org/git/linux-docbook.git
 S:     Maintained
 
@@ -2037,9 +2039,10 @@ L:       linux-kernel@vger.kernel.org
 S:     Maintained
 
 NI5010 NETWORK DRIVER
-P:     Jan-Pascal van Best and Andreas Mohr
-M:     Jan-Pascal van Best <jvbest@qv3pluto.leidenuniv.nl>
-M:     Andreas Mohr <100.30936@germany.net>
+P:     Jan-Pascal van Best
+M:     janpascal@vanbest.org
+P:     Andreas Mohr
+M:     andi@lisas.de
 L:     netdev@vger.kernel.org
 S:     Maintained
 
@@ -2298,6 +2301,14 @@ M:       promise@pnd-pc.demon.co.uk
 W:     http://www.pnd-pc.demon.co.uk/promise/
 S:     Maintained
 
+PVRUSB2 VIDEO4LINUX DRIVER
+P:     Mike Isely
+M:     isely@pobox.com
+L:     pvrusb2@isely.net
+L:     video4linux-list@redhat.com
+W:     http://www.isely.net/pvrusb2/
+S:     Maintained
+
 PXA2xx SUPPORT
 P:     Nicolas Pitre
 M:     nico@cam.org
@@ -2555,13 +2566,6 @@ M:       thomas@winischhofer.net
 W:     http://www.winischhofer.at/linuxsisusbvga.shtml
 S:     Maintained
 
-SMB FILESYSTEM
-P:     Urban Widmark
-M:     urban@teststation.com
-W:     http://samba.org/
-L:     samba@samba.org
-S:     Maintained
-
 SMC91x ETHERNET DRIVER
 P:     Nicolas Pitre
 M:     nico@cam.org