aboutsummaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-01-14 08:47:26 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-01-14 08:47:26 -0800
commitc1e0d97d3d63d5173baf8c39a13dc5c25b031bd4 (patch)
tree4bf35b974326f1f17de4ea3d17b65aa44811da01 /MAINTAINERS
parent7f5db6a8022e8d4bb92b3d638068d2c2a9c9b59b (diff)
parent51120c2cc70fc241721b8016f4eff575e7d6aa30 (diff)
downloadlinux-2.6.38-lt-ux500-c1e0d97d3d63d5173baf8c39a13dc5c25b031bd4.tar.gz
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: [S390] MAINTAINERS: Update zcrypt driver entry [S390] Randomize PIEs [S390] Randomise the brk region [S390] Add is_32bit_task() helper function [S390] Randomize lower bits of stack address [S390] Randomize mmap start address [S390] Rearrange mmap.c [S390] Enable flexible mmap layout for 64 bit processes [S390] vdso: dont map at mmap_base [S390] reduce miminum gap between stack and mmap_base [S390] mmap: consider stack address randomization [S390] Update default configuration [S390] cio: path_event overindication after resume
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS3
1 files changed, 1 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index af656ded404..89e4d4b145b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5272,8 +5272,7 @@ S: Supported
F: drivers/s390/net/
S390 ZCRYPT DRIVER
-M: Felix Beck <felix.beck@de.ibm.com>
-M: Ralph Wuerthner <ralph.wuerthner@de.ibm.com>
+M: Holger Dengler <hd@linux.vnet.ibm.com>
M: linux390@de.ibm.com
L: linux-s390@vger.kernel.org
W: http://www.ibm.com/developerworks/linux/linux390/