Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
[linux-2.6.git] / MAINTAINERS
index 11b59d2c7cf536617a9cc050e6607d870393c7b6..ed2a83cfad7c05de65acf1c3cbcbe46df7f2dd57 100644 (file)
@@ -2452,6 +2452,8 @@ S:      Maintained
 S390
 P:     Martin Schwidefsky
 M:     schwidefsky@de.ibm.com
+P:     Heiko Carstens
+M:     heiko.carstens@de.ibm.com
 M:     linux390@de.ibm.com
 L:     linux-390@vm.marist.edu
 W:     http://www.ibm.com/developerworks/linux/linux390/