diff --git a/[refs] b/[refs] index 42715c0a0313..c5774df26b5f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b4a26be9f6f8bb72998e445cc75fc6dc0c29513a +refs/heads/master: b809b9ca3e6b47561514ae9767177cc482e90fc6 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index a0e3c3a47a51..66ed1afaa5e1 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -4482,17 +4482,17 @@ S: Maintained F: drivers/ata/sata_promise.* PS3 NETWORK SUPPORT -M: Geoff Levand +M: Geoff Levand 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 +M: Geoff Levand 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