aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-12-09 22:01:47 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-09 22:01:47 -0500
commit67dd2f5a669f48e48ea1013fb80522adca8287f4 (patch)
treeeee4e7f15df90f899211cde0a669d661085de05d /MAINTAINERS
parent5327b9b83a9c45a3fcbcda224a2b02d9eea9f6bb (diff)
parent42d61b9b415686d81eaa022b846737548876e51d (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: (72 commits) [S390] 3215/3270 console: remove wrong comment [S390] dasd: remove BKL from extended error reporting code [S390] vmlogrdr: remove BKL [S390] vmur: remove BKL [S390] zcrypt: remove BKL [S390] 3270: remove BKL [S390] vmwatchdog: remove lock_kernel() from open() function [S390] monwriter: remove lock_kernel() from open() function [S390] monreader: remove lock_kernel() from open() function [S390] s390: remove unused nfsd #includes [S390] ftrace: build ftrace.o when CONFIG_FTRACE_SYSCALLS is set for s390 [S390] etr/stp: put correct per cpu variable [S390] tty3270: move keyboard compat ioctls [S390] sclp: improve servicability setting [S390] s390: use change recording override for kernel mapping [S390] MAINTAINERS: Add s390 drivers block [S390] use generic sockios.h header file [S390] use generic termbits.h header file [S390] smp: remove unused typedef and defines [S390] cmm: free pages on hibernate. ...
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS3
1 files changed, 3 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index ea781c1cfb5a..c8973c6102d8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3139,6 +3139,7 @@ S: Supported
3139F: Documentation/s390/kvm.txt 3139F: Documentation/s390/kvm.txt
3140F: arch/s390/include/asm/kvm* 3140F: arch/s390/include/asm/kvm*
3141F: arch/s390/kvm/ 3141F: arch/s390/kvm/
3142F: drivers/s390/kvm/
3142 3143
3143KEXEC 3144KEXEC
3144M: Eric Biederman <ebiederm@xmission.com> 3145M: Eric Biederman <ebiederm@xmission.com>
@@ -4553,6 +4554,7 @@ L: linux-s390@vger.kernel.org
4553W: http://www.ibm.com/developerworks/linux/linux390/ 4554W: http://www.ibm.com/developerworks/linux/linux390/
4554S: Supported 4555S: Supported
4555F: arch/s390/ 4556F: arch/s390/
4557F: drivers/s390/
4556 4558
4557S390 NETWORK DRIVERS 4559S390 NETWORK DRIVERS
4558M: Ursula Braun <ursula.braun@de.ibm.com> 4560M: Ursula Braun <ursula.braun@de.ibm.com>
@@ -4568,6 +4570,7 @@ M: Felix Beck <felix.beck@de.ibm.com>
4568M: Ralph Wuerthner <ralph.wuerthner@de.ibm.com> 4570M: Ralph Wuerthner <ralph.wuerthner@de.ibm.com>
4569M: linux390@de.ibm.com 4571M: linux390@de.ibm.com
4570L: linux-s390@vger.kernel.org 4572L: linux-s390@vger.kernel.org
4573W: http://www.ibm.com/developerworks/linux/linux390/
4571S: Supported 4574S: Supported
4572F: drivers/s390/crypto/ 4575F: drivers/s390/crypto/
4573 4576