diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-26 11:55:31 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-26 11:55:31 +1100 |
| commit | 1bb976266059951f5b7c826455ba2496ed98b91e (patch) | |
| tree | 9116874d4bd5672daf7fff67fa79f6ce2d977dc2 /MAINTAINERS | |
| parent | 95093c42849ce2bfe95a3663aa290e2a1a27a3b2 (diff) | |
| parent | bd6ee63f5f6e8f97fbc672cd238fc062b5559c32 (diff) | |
Merge remote branch 's390/features'
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 2a31ad2576b9..0946b1dbde98 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3098,6 +3098,7 @@ S: Supported F: Documentation/s390/kvm.txt F: arch/s390/include/asm/kvm* F: arch/s390/kvm/ +F: drivers/s390/kvm/ KEXEC M: Eric Biederman <ebiederm@xmission.com> @@ -4512,6 +4513,7 @@ L: linux-s390@vger.kernel.org W: http://www.ibm.com/developerworks/linux/linux390/ S: Supported F: arch/s390/ +F: drivers/s390/ S390 NETWORK DRIVERS M: Ursula Braun <ursula.braun@de.ibm.com> @@ -4527,6 +4529,7 @@ M: Felix Beck <felix.beck@de.ibm.com> M: Ralph Wuerthner <ralph.wuerthner@de.ibm.com> M: linux390@de.ibm.com L: linux-s390@vger.kernel.org +W: http://www.ibm.com/developerworks/linux/linux390/ S: Supported F: drivers/s390/crypto/ |