summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2014-07-21 11:22:58 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2014-07-21 11:22:58 +1000
commit82f12fb726c48880efdcd073ae0d88d33a9d1798 (patch)
treeac02c17fd1f05352a223df31490077c09c2bd884 /MAINTAINERS
parent10dfcc8e80e593a6ac650bde1480a413e9567aac (diff)
parentcd1154770ba984f4c766cac5ea42c38880080b1d (diff)
Merge remote-tracking branch 'powerpc/next'
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS3
1 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index ac77ff93c08f..83b4d23b10f9 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5422,16 +5422,17 @@ F: arch/powerpc/*/*/*virtex*
LINUX FOR POWERPC EMBEDDED PPC8XX
M: Vitaly Bordug <vitb@kernel.crashing.org>
-M: Marcelo Tosatti <marcelo@kvack.org>
W: http://www.penguinppc.org/
L: linuxppc-dev@lists.ozlabs.org
S: Maintained
F: arch/powerpc/platforms/8xx/
LINUX FOR POWERPC EMBEDDED PPC83XX AND PPC85XX
+M: Scott Wood <scottwood@freescale.com>
M: Kumar Gala <galak@kernel.crashing.org>
W: http://www.penguinppc.org/
L: linuxppc-dev@lists.ozlabs.org
+T: git git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git
S: Maintained
F: arch/powerpc/platforms/83xx/
F: arch/powerpc/platforms/85xx/