diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-27 13:48:46 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-27 13:48:46 -0400 |
| commit | cc106eb35ed4abea675bce0d8fe40a46ff0b4a72 (patch) | |
| tree | 7d18624a769680049f2933ce48a02c8e08e5937c /MAINTAINERS | |
| parent | 4e455c6782bd6bf6a0135c1e1c9f018ec191979e (diff) | |
| parent | 3bfe68580a9d2a25465fc004986acd7991d700d1 (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] fill out file list in s390 MAINTAINERS entry
[S390] Add support for LZO-compressed kernels.
[S390] cmm: get rid of CMM_PROC config option
[S390] cmm: remove superfluous EXPORT_SYMBOLs plus cleanups
[S390] dasd: unit check handling during internal cio I/O
[S390] cio: unit check handling during internal I/O
[S390] ccwgroup: add locking around drvdata access
[S390] cio: remove stsch
[S390] spp: remove KVM_AWARE_CMF config option
[S390] kprobes: forbid probing of stnsm/stosm/epsw
[S390] spp: fix compilation for CONFIG_32BIT
[S390] atomic: implement atomic64_dec_if_positive
[S390] cmm: fix crash on module unload
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 8b7eba2de603..33047a605438 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -4836,6 +4836,9 @@ W: http://www.ibm.com/developerworks/linux/linux390/ | |||
| 4836 | S: Supported | 4836 | S: Supported |
| 4837 | F: arch/s390/ | 4837 | F: arch/s390/ |
| 4838 | F: drivers/s390/ | 4838 | F: drivers/s390/ |
| 4839 | F: fs/partitions/ibm.c | ||
| 4840 | F: Documentation/s390/ | ||
| 4841 | F: Documentation/DocBook/s390* | ||
| 4839 | 4842 | ||
| 4840 | S390 NETWORK DRIVERS | 4843 | S390 NETWORK DRIVERS |
| 4841 | M: Ursula Braun <ursula.braun@de.ibm.com> | 4844 | M: Ursula Braun <ursula.braun@de.ibm.com> |