git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
[pandora-kernel.git]
/
MAINTAINERS
diff --git
a/MAINTAINERS
b/MAINTAINERS
index
1838875
..
d5b0b1b
100644
(file)
--- a/
MAINTAINERS
+++ b/
MAINTAINERS
@@
-4482,17
+4482,17
@@
S: Maintained
F: drivers/ata/sata_promise.*
PS3 NETWORK SUPPORT
F: drivers/ata/sata_promise.*
PS3 NETWORK SUPPORT
-M: Geoff Levand <geoff
rey.levand@am.sony.com
>
+M: Geoff Levand <geoff
@infradead.org
>
L: netdev@vger.kernel.org
L: cbe-oss-dev@ozlabs.org
L: netdev@vger.kernel.org
L: cbe-oss-dev@ozlabs.org
-S:
Support
ed
+S:
Maintain
ed
F: drivers/net/ps3_gelic_net.*
PS3 PLATFORM SUPPORT
F: drivers/net/ps3_gelic_net.*
PS3 PLATFORM SUPPORT
-M: Geoff Levand <geoff
rey.levand@am.sony.com
>
+M: Geoff Levand <geoff
@infradead.org
>
L: linuxppc-dev@ozlabs.org
L: cbe-oss-dev@ozlabs.org
L: linuxppc-dev@ozlabs.org
L: cbe-oss-dev@ozlabs.org
-S:
Support
ed
+S:
Maintain
ed
F: arch/powerpc/boot/ps3*
F: arch/powerpc/include/asm/lv1call.h
F: arch/powerpc/include/asm/ps3*.h
F: arch/powerpc/boot/ps3*
F: arch/powerpc/include/asm/lv1call.h
F: arch/powerpc/include/asm/ps3*.h