aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS13
1 files changed, 6 insertions, 7 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 31e858617d0b..a4035d7266bf 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1960,7 +1960,7 @@ F: lib/kobj*
1960 1960
1961DRM DRIVERS 1961DRM DRIVERS
1962M: David Airlie <airlied@linux.ie> 1962M: David Airlie <airlied@linux.ie>
1963L: dri-devel@lists.sourceforge.net 1963L: dri-devel@lists.freedesktop.org
1964T: git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git 1964T: git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git
1965S: Maintained 1965S: Maintained
1966F: drivers/gpu/drm/ 1966F: drivers/gpu/drm/
@@ -4483,17 +4483,17 @@ S: Maintained
4483F: drivers/ata/sata_promise.* 4483F: drivers/ata/sata_promise.*
4484 4484
4485PS3 NETWORK SUPPORT 4485PS3 NETWORK SUPPORT
4486M: Geoff Levand <geoffrey.levand@am.sony.com> 4486M: Geoff Levand <geoff@infradead.org>
4487L: netdev@vger.kernel.org 4487L: netdev@vger.kernel.org
4488L: cbe-oss-dev@ozlabs.org 4488L: cbe-oss-dev@ozlabs.org
4489S: Supported 4489S: Maintained
4490F: drivers/net/ps3_gelic_net.* 4490F: drivers/net/ps3_gelic_net.*
4491 4491
4492PS3 PLATFORM SUPPORT 4492PS3 PLATFORM SUPPORT
4493M: Geoff Levand <geoffrey.levand@am.sony.com> 4493M: Geoff Levand <geoff@infradead.org>
4494L: linuxppc-dev@ozlabs.org 4494L: linuxppc-dev@ozlabs.org
4495L: cbe-oss-dev@ozlabs.org 4495L: cbe-oss-dev@ozlabs.org
4496S: Supported 4496S: Maintained
4497F: arch/powerpc/boot/ps3* 4497F: arch/powerpc/boot/ps3*
4498F: arch/powerpc/include/asm/lv1call.h 4498F: arch/powerpc/include/asm/lv1call.h
4499F: arch/powerpc/include/asm/ps3*.h 4499F: arch/powerpc/include/asm/ps3*.h
@@ -4792,12 +4792,11 @@ F: drivers/s390/crypto/
4792 4792
4793S390 ZFCP DRIVER 4793S390 ZFCP DRIVER
4794M: Christof Schmitt <christof.schmitt@de.ibm.com> 4794M: Christof Schmitt <christof.schmitt@de.ibm.com>
4795M: Martin Peschke <mp3@de.ibm.com> 4795M: Swen Schillig <swen@vnet.ibm.com>
4796M: linux390@de.ibm.com 4796M: linux390@de.ibm.com
4797L: linux-s390@vger.kernel.org 4797L: linux-s390@vger.kernel.org
4798W: http://www.ibm.com/developerworks/linux/linux390/ 4798W: http://www.ibm.com/developerworks/linux/linux390/
4799S: Supported 4799S: Supported
4800F: Documentation/s390/zfcpdump.txt
4801F: drivers/s390/scsi/zfcp_* 4800F: drivers/s390/scsi/zfcp_*
4802 4801
4803S390 IUCV NETWORK LAYER 4802S390 IUCV NETWORK LAYER