Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...

[pandora-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 766b1ad..bd446e2 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2490,8 +2490,8 @@ W:        http://www.ibm.com/developerworks/linux/linux390/
 S:     Supported
 
 S390 ZFCP DRIVER
-P:     Andreas Herrmann
-M:     aherrman@de.ibm.com
+P:     Swen Schillig
+M:     swen@vnet.ibm.com
 M:     linux390@de.ibm.com
 L:     linux-390@vm.marist.edu
 W:     http://www.ibm.com/developerworks/linux/linux390/
@@ -2655,7 +2655,6 @@ M:        josejx@gentoo.org
 P:     Daniel Drake
 M:     dsd@gentoo.org
 W:     http://softmac.sipsolutions.net/
-L:     softmac-dev@sipsolutions.net
 L:     netdev@vger.kernel.org
 S:     Maintained