Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[linux] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index a4961b0..3bb6640 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -10135,8 +10135,8 @@ S:      Supported
 F:     drivers/s390/cio/
 
 S390 DASD DRIVER
-M:     Stefan Weinhuber <wein@de.ibm.com>
-M:     Stefan Haberland <stefan.haberland@de.ibm.com>
+M:     Stefan Haberland <sth@linux.vnet.ibm.com>
+M:     Jan Hoeppner <hoeppner@linux.vnet.ibm.com>
 L:     linux-s390@vger.kernel.org
 W:     http://www.ibm.com/developerworks/linux/linux390/
 S:     Supported