projects
/
GitHub
/
MotorolaMobilityLLC
/
kernel-slsi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[GitHub/MotorolaMobilityLLC/kernel-slsi.git]
/
MAINTAINERS
diff --git
a/MAINTAINERS
b/MAINTAINERS
index bc272bf0ff9732c139b0af7aa93781e88d999128..151f4ef978a4aa5ae82c976e76c8716cafa9f4fb 100644
(file)
--- a/
MAINTAINERS
+++ b/
MAINTAINERS
@@
-2930,6
+2930,13
@@
M: mikpe@it.uu.se
L: linux-ide@vger.kernel.org
S: Maintained
+PS3 NETWORK SUPPORT
+P: Masakazu Mokuno
+M: mokuno@sm.sony.co.jp
+L: netdev@vger.kernel.org
+L: cbe-oss-dev@ozlabs.org
+S: Supported
+
PS3 PLATFORM SUPPORT
P: Geoff Levand
M: geoffrey.levand@am.sony.com