summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-05-05 08:25:37 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-05-05 08:25:37 -0700
commit32bc66d8d0edc9b04dea9ebac299bdb7ad781d6b (patch)
treeb095b022c36d61ae5326d3468e937e59cc1576a6 /MAINTAINERS
parenta31ea2f568d0ad4bb11e2fe8a94b95de0cb5fa69 (diff)
parent0203d6ec4e88062f20558fbed3cdff2af758a53b (diff)
downloadlinux-3.10-32bc66d8d0edc9b04dea9ebac299bdb7ad781d6b.tar.gz
linux-3.10-32bc66d8d0edc9b04dea9ebac299bdb7ad781d6b.tar.bz2
linux-3.10-32bc66d8d0edc9b04dea9ebac299bdb7ad781d6b.zip
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc: Fix setting of oprofile cpu type powerpc: Update MPC5xxx and Xilinx Virtex maintainer entries powerpc adjust oprofile_cpu_type version 3
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS4
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 9de961bd121..2b349ba4add 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3434,11 +3434,10 @@ L: linuxppc-dev@ozlabs.org
S: Maintained
LINUX FOR POWERPC EMBEDDED MPC5XXX
-P: Sylvain Munaut
-M: tnt@246tNt.com
P: Grant Likely
M: grant.likely@secretlab.ca
L: linuxppc-dev@ozlabs.org
+T: git git://git.secretlab.ca/git/linux-2.6.git
S: Maintained
LINUX FOR POWERPC EMBEDDED PPC4XX
@@ -3456,6 +3455,7 @@ P: Grant Likely
M: grant.likely@secretlab.ca
W: http://wiki.secretlab.ca/index.php/Linux_on_Xilinx_Virtex
L: linuxppc-dev@ozlabs.org
+T: git git://git.secretlab.ca/git/linux-2.6.git
S: Maintained
LINUX FOR POWERPC EMBEDDED PPC8XX