diff options
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 5b422908d0f3..d5b0b1b6dc52 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -485,8 +485,8 @@ S: Maintained | |||
485 | F: drivers/input/mouse/bcm5974.c | 485 | F: drivers/input/mouse/bcm5974.c |
486 | 486 | ||
487 | APPLE SMC DRIVER | 487 | APPLE SMC DRIVER |
488 | M: Nicolas Boichat <nicolas@boichat.ch> | 488 | M: Henrik Rydberg <rydberg@euromail.se> |
489 | L: mactel-linux-devel@lists.sourceforge.net | 489 | L: lm-sensors@lm-sensors.org |
490 | S: Maintained | 490 | S: Maintained |
491 | F: drivers/hwmon/applesmc.c | 491 | F: drivers/hwmon/applesmc.c |
492 | 492 | ||
@@ -1960,7 +1960,7 @@ F: lib/kobj* | |||
1960 | 1960 | ||
1961 | DRM DRIVERS | 1961 | DRM DRIVERS |
1962 | M: David Airlie <airlied@linux.ie> | 1962 | M: David Airlie <airlied@linux.ie> |
1963 | L: dri-devel@lists.sourceforge.net | 1963 | L: dri-devel@lists.freedesktop.org |
1964 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git | 1964 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git |
1965 | S: Maintained | 1965 | S: Maintained |
1966 | F: drivers/gpu/drm/ | 1966 | F: drivers/gpu/drm/ |
@@ -4482,17 +4482,17 @@ S: Maintained | |||
4482 | F: drivers/ata/sata_promise.* | 4482 | F: drivers/ata/sata_promise.* |
4483 | 4483 | ||
4484 | PS3 NETWORK SUPPORT | 4484 | PS3 NETWORK SUPPORT |
4485 | M: Geoff Levand <geoffrey.levand@am.sony.com> | 4485 | M: Geoff Levand <geoff@infradead.org> |
4486 | L: netdev@vger.kernel.org | 4486 | L: netdev@vger.kernel.org |
4487 | L: cbe-oss-dev@ozlabs.org | 4487 | L: cbe-oss-dev@ozlabs.org |
4488 | S: Supported | 4488 | S: Maintained |
4489 | F: drivers/net/ps3_gelic_net.* | 4489 | F: drivers/net/ps3_gelic_net.* |
4490 | 4490 | ||
4491 | PS3 PLATFORM SUPPORT | 4491 | PS3 PLATFORM SUPPORT |
4492 | M: Geoff Levand <geoffrey.levand@am.sony.com> | 4492 | M: Geoff Levand <geoff@infradead.org> |
4493 | L: linuxppc-dev@ozlabs.org | 4493 | L: linuxppc-dev@ozlabs.org |
4494 | L: cbe-oss-dev@ozlabs.org | 4494 | L: cbe-oss-dev@ozlabs.org |
4495 | S: Supported | 4495 | S: Maintained |
4496 | F: arch/powerpc/boot/ps3* | 4496 | F: arch/powerpc/boot/ps3* |
4497 | F: arch/powerpc/include/asm/lv1call.h | 4497 | F: arch/powerpc/include/asm/lv1call.h |
4498 | F: arch/powerpc/include/asm/ps3*.h | 4498 | F: arch/powerpc/include/asm/ps3*.h |
@@ -4791,12 +4791,11 @@ F: drivers/s390/crypto/ | |||
4791 | 4791 | ||
4792 | S390 ZFCP DRIVER | 4792 | S390 ZFCP DRIVER |
4793 | M: Christof Schmitt <christof.schmitt@de.ibm.com> | 4793 | M: Christof Schmitt <christof.schmitt@de.ibm.com> |
4794 | M: Martin Peschke <mp3@de.ibm.com> | 4794 | M: Swen Schillig <swen@vnet.ibm.com> |
4795 | M: linux390@de.ibm.com | 4795 | M: linux390@de.ibm.com |
4796 | L: linux-s390@vger.kernel.org | 4796 | L: linux-s390@vger.kernel.org |
4797 | W: http://www.ibm.com/developerworks/linux/linux390/ | 4797 | W: http://www.ibm.com/developerworks/linux/linux390/ |
4798 | S: Supported | 4798 | S: Supported |
4799 | F: Documentation/s390/zfcpdump.txt | ||
4800 | F: drivers/s390/scsi/zfcp_* | 4799 | F: drivers/s390/scsi/zfcp_* |
4801 | 4800 | ||
4802 | S390 IUCV NETWORK LAYER | 4801 | S390 IUCV NETWORK LAYER |