aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-04-29 20:16:36 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-04-29 20:16:36 -0400
commit553cbf0a8f19c669bed82028988aa977558ef551 (patch)
treec0aecc102d1d3bf26f56dc69775d1657a456e2d4 /MAINTAINERS
parent27fb8d7b1fe7c2fa2d7c1f243b899793e1b080e0 (diff)
parent76ad4b8ebd5c68c8bf490bdb1fb4dcbc266e5223 (diff)
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc/ps3: Update ps3_defconfig powerpc/ps3: Update platform maintainer powerpc/pseries: Flush lazy kernel mappings after unplug operations powerpc/numa: Add form 1 NUMA affinity powerpc/fsl-booke: Fix CONFIG_RELOCATABLE support on FSL Book-E ppc32 powerpc: 2.6.34 update of defconfigs for embedded 6xx/7xxx, 8xx, 8xxx powerpc/mpc8xxx defconfigs - turn off SYSFS_DEPRECATED powerpc/83xx: configure SIL SATA driver in 83xx-wide defconfig powerpc/83xx: enable EPOLL syscall in defconfig powerpc/83xx: add RTC drivers in 83xx defconfig powerpc/fsl-cpm: Configure clock correctly for SCC powerpc/fsl_booke: Correct test for MMU_FTR_BIG_PHYS powerpc/85xx/86xx: Fix build w/ CONFIG_PCI=n
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS8
1 files changed, 4 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 183887518fe3..d5b0b1b6dc52 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4482,17 +4482,17 @@ S: Maintained
4482F: drivers/ata/sata_promise.* 4482F: drivers/ata/sata_promise.*
4483 4483
4484PS3 NETWORK SUPPORT 4484PS3 NETWORK SUPPORT
4485M: Geoff Levand <geoffrey.levand@am.sony.com> 4485M: Geoff Levand <geoff@infradead.org>
4486L: netdev@vger.kernel.org 4486L: netdev@vger.kernel.org
4487L: cbe-oss-dev@ozlabs.org 4487L: cbe-oss-dev@ozlabs.org
4488S: Supported 4488S: Maintained
4489F: drivers/net/ps3_gelic_net.* 4489F: drivers/net/ps3_gelic_net.*
4490 4490
4491PS3 PLATFORM SUPPORT 4491PS3 PLATFORM SUPPORT
4492M: Geoff Levand <geoffrey.levand@am.sony.com> 4492M: Geoff Levand <geoff@infradead.org>
4493L: linuxppc-dev@ozlabs.org 4493L: linuxppc-dev@ozlabs.org
4494L: cbe-oss-dev@ozlabs.org 4494L: cbe-oss-dev@ozlabs.org
4495S: Supported 4495S: Maintained
4496F: arch/powerpc/boot/ps3* 4496F: arch/powerpc/boot/ps3*
4497F: arch/powerpc/include/asm/lv1call.h 4497F: arch/powerpc/include/asm/lv1call.h
4498F: arch/powerpc/include/asm/ps3*.h 4498F: arch/powerpc/include/asm/ps3*.h