diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-05 11:25:37 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-05 11:25:37 -0400 |
| commit | 32bc66d8d0edc9b04dea9ebac299bdb7ad781d6b (patch) | |
| tree | b095b022c36d61ae5326d3468e937e59cc1576a6 /MAINTAINERS | |
| parent | a31ea2f568d0ad4bb11e2fe8a94b95de0cb5fa69 (diff) | |
| parent | 0203d6ec4e88062f20558fbed3cdff2af758a53b (diff) | |
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-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 9de961bd1214..2b349ba4add4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -3434,11 +3434,10 @@ L: linuxppc-dev@ozlabs.org | |||
| 3434 | S: Maintained | 3434 | S: Maintained |
| 3435 | 3435 | ||
| 3436 | LINUX FOR POWERPC EMBEDDED MPC5XXX | 3436 | LINUX FOR POWERPC EMBEDDED MPC5XXX |
| 3437 | P: Sylvain Munaut | ||
| 3438 | M: tnt@246tNt.com | ||
| 3439 | P: Grant Likely | 3437 | P: Grant Likely |
| 3440 | M: grant.likely@secretlab.ca | 3438 | M: grant.likely@secretlab.ca |
| 3441 | L: linuxppc-dev@ozlabs.org | 3439 | L: linuxppc-dev@ozlabs.org |
| 3440 | T: git git://git.secretlab.ca/git/linux-2.6.git | ||
| 3442 | S: Maintained | 3441 | S: Maintained |
| 3443 | 3442 | ||
| 3444 | LINUX FOR POWERPC EMBEDDED PPC4XX | 3443 | LINUX FOR POWERPC EMBEDDED PPC4XX |
| @@ -3456,6 +3455,7 @@ P: Grant Likely | |||
| 3456 | M: grant.likely@secretlab.ca | 3455 | M: grant.likely@secretlab.ca |
| 3457 | W: http://wiki.secretlab.ca/index.php/Linux_on_Xilinx_Virtex | 3456 | W: http://wiki.secretlab.ca/index.php/Linux_on_Xilinx_Virtex |
| 3458 | L: linuxppc-dev@ozlabs.org | 3457 | L: linuxppc-dev@ozlabs.org |
| 3458 | T: git git://git.secretlab.ca/git/linux-2.6.git | ||
| 3459 | S: Maintained | 3459 | S: Maintained |
| 3460 | 3460 | ||
| 3461 | LINUX FOR POWERPC EMBEDDED PPC8XX | 3461 | LINUX FOR POWERPC EMBEDDED PPC8XX |