diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-14 11:47:26 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-14 11:47:26 -0500 |
| commit | c1e0d97d3d63d5173baf8c39a13dc5c25b031bd4 (patch) | |
| tree | 4bf35b974326f1f17de4ea3d17b65aa44811da01 /MAINTAINERS | |
| parent | 7f5db6a8022e8d4bb92b3d638068d2c2a9c9b59b (diff) | |
| parent | 51120c2cc70fc241721b8016f4eff575e7d6aa30 (diff) | |
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-- | MAINTAINERS | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index af656ded404e..89e4d4b145bb 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -5272,8 +5272,7 @@ S: Supported | |||
| 5272 | F: drivers/s390/net/ | 5272 | F: drivers/s390/net/ |
| 5273 | 5273 | ||
| 5274 | S390 ZCRYPT DRIVER | 5274 | S390 ZCRYPT DRIVER |
| 5275 | M: Felix Beck <felix.beck@de.ibm.com> | 5275 | M: Holger Dengler <hd@linux.vnet.ibm.com> |
| 5276 | M: Ralph Wuerthner <ralph.wuerthner@de.ibm.com> | ||
| 5277 | M: linux390@de.ibm.com | 5276 | M: linux390@de.ibm.com |
| 5278 | L: linux-s390@vger.kernel.org | 5277 | L: linux-s390@vger.kernel.org |
| 5279 | W: http://www.ibm.com/developerworks/linux/linux390/ | 5278 | W: http://www.ibm.com/developerworks/linux/linux390/ |