diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-20 08:15:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-20 08:15:34 -0700 |
| commit | bca39da5645c72048e8854340575c338b8100bca (patch) | |
| tree | e7ef9ac8f86367b2af3b1eef6c19f717f77eb89a /MAINTAINERS | |
| parent | 551395ae667d699189014f762355e9131fc03e79 (diff) | |
| parent | 09c201219b000c5d79a7a7ebeb2f9768e97224fc (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] Update defconfigs for desktop/server systems
[POWERPC] Fix mpc8377_mds.dts DMA nodes to match spec
[POWERPC] Update arch/powerpc/boot/.gitignore
[POWERPC] Remove generated files on make clean
[POWERPC] powerpc/mm/hash_low_32.S: Remove CVS keyword
[POWERPC] Update Cell MAINTAINERS entry, add spufs entry
lmb: Fix compile warning
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index a0291616a35f..dc94fc5cb25b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -982,13 +982,6 @@ L: bonding-devel@lists.sourceforge.net W: http://sourceforge.net/projects/bonding/ S: Supported -BROADBAND PROCESSOR ARCHITECTURE -P: Arnd Bergmann -M: arnd@arndb.de -L: linuxppc-dev@ozlabs.org -W: http://www.penguinppc.org/ppc64/ -S: Supported - BROADCOM B44 10/100 ETHERNET DRIVER P: Gary Zambrano M: zambrano@broadcom.com @@ -1052,6 +1045,14 @@ L: linux-kernel@vger.kernel.org L: discuss@x86-64.org S: Maintained +CELL BROADBAND ENGINE ARCHITECTURE +P: Arnd Bergmann +M: arnd@arndb.de +L: linuxppc-dev@ozlabs.org +L: cbe-oss-dev@ozlabs.org +W: http://www.ibm.com/developerworks/power/cell/ +S: Supported + CFAG12864B LCD DRIVER P: Miguel Ojeda Sandonis M: maxextreme@gmail.com @@ -3776,6 +3777,14 @@ M: dbrownell@users.sourceforge.net L: spi-devel-general@lists.sourceforge.net S: Maintained +SPU FILE SYSTEM +P: Jeremy Kerr +M: jk@ozlabs.org +L: linuxppc-dev@ozlabs.org +L: cbe-oss-dev@ozlabs.org +W: http://www.ibm.com/developerworks/power/cell/ +S: Supported + STABLE BRANCH: P: Greg Kroah-Hartman M: greg@kroah.com |