diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-04-30 09:56:41 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-04-30 09:56:44 +0200 |
| commit | 3ca50496c2677a2b3fdd3ede86660fd1433beac6 (patch) | |
| tree | 97a76d8479a8d8a96e04ed0694b8dbf89457bfcc /MAINTAINERS | |
| parent | 462b04e28a7ec1339c892117c3f20a40e55d0e83 (diff) | |
| parent | 66f41d4c5c8a5deed66fdcc84509376c9a0bf9d8 (diff) | |
| download | op-kernel-dev-3ca50496c2677a2b3fdd3ede86660fd1433beac6.zip op-kernel-dev-3ca50496c2677a2b3fdd3ede86660fd1433beac6.tar.gz | |
Merge commit 'v2.6.34-rc6' into perf/core
Merge reason: update to the latest -rc.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 693c2fe..5085c90 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4482,17 +4482,17 @@ S: Maintained F: drivers/ata/sata_promise.* PS3 NETWORK SUPPORT -M: Geoff Levand <geoffrey.levand@am.sony.com> +M: Geoff Levand <geoff@infradead.org> L: netdev@vger.kernel.org L: cbe-oss-dev@ozlabs.org -S: Supported +S: Maintained F: drivers/net/ps3_gelic_net.* PS3 PLATFORM SUPPORT -M: Geoff Levand <geoffrey.levand@am.sony.com> +M: Geoff Levand <geoff@infradead.org> L: linuxppc-dev@ozlabs.org L: cbe-oss-dev@ozlabs.org -S: Supported +S: Maintained F: arch/powerpc/boot/ps3* F: arch/powerpc/include/asm/lv1call.h F: arch/powerpc/include/asm/ps3*.h |
