Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6

[linux-2.6-omap-h63xx.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index bc919b645f379cf52cc688dcbde4ef7aa4c9a5c2..fa7be04b0cf0f2fb4d448b86d3dc122b39a22df6 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2845,7 +2845,7 @@ P:        Roman Zippel
 M:     zippel@linux-m68k.org
 L:     linux-m68k@lists.linux-m68k.org
 W:     http://www.linux-m68k.org/
-W:     http://linux-m68k-cvs.ubb.ca/
+T:     git git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git
 S:     Maintained
 
 M68K ON APPLE MACINTOSH
@@ -3745,6 +3745,15 @@ L:       linux-s390@vger.kernel.org
 W:     http://www.ibm.com/developerworks/linux/linux390/
 S:     Supported
 
+S390 ZCRYPT DRIVER
+P:     Felix Beck
+M:     felix.beck@de.ibm.com
+P:     Ralph Wuerthner
+M:     ralph.wuerthner@de.ibm.com
+M:     linux390@de.ibm.com
+L:     linux-s390@vger.kernel.org
+S:     Supported
+
 S390 ZFCP DRIVER
 P:     Christof Schmitt
 M:     christof.schmitt@de.ibm.com