summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2013-02-05 10:59:04 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2013-02-05 10:59:04 +1100
commitf9bbcff3ebf3cc983e2aa1af63d481fa5b464b7f (patch)
treea461d100902e8087909ce874961edd230a7bb26f /MAINTAINERS
parent278ed302b8d198d8a0d33efaef4a7fa352cce97c (diff)
parent7e468c4b99a392c204a6cbd25f7146174c6a6927 (diff)
Merge remote-tracking branch 's390/features'
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS2
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 6ecfd3f4d34f..b02a6484533a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6509,7 +6509,7 @@ S: Supported
F: drivers/s390/net/
S390 ZCRYPT DRIVER
-M: Holger Dengler <hd@linux.vnet.ibm.com>
+M: Ingo Tuchscherer <ingo.tuchscherer@de.ibm.com>
M: linux390@de.ibm.com
L: linux-s390@vger.kernel.org
W: http://www.ibm.com/developerworks/linux/linux390/