diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-28 18:55:32 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-28 18:55:32 -0400 |
| commit | c3310e7766ebe7491910715c3161a4f29fa0112e (patch) | |
| tree | 95936f702b4c21ce30679342643da2ebf1a9f7f3 /MAINTAINERS | |
| parent | 13beadd91f148933f47947a88ab2c97a1ca9768d (diff) | |
| parent | d8f48457d5af6601abdecaad7a95c45bfeef90d5 (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/ps3: Fix build error on UP
powerpc/cell: Select PCI for IBM_CELL_BLADE AND CELLEB
powerpc: ppc32 needs elf_read_implies_exec()
powerpc/86xx: Add device_type entry to soc for ppc9a
powerpc/44x: Correct memory size calculation for denali-based boards
maintainers: Fix PowerPC 4xx git tree
powerpc: fix for long standing bug noticed by gcc 4.4.0
Revert "powerpc: Add support for early tlbilx opcode"
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index ef03abed595a..c547f4a2bb62 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -3448,7 +3448,7 @@ P: Matt Porter | |||
| 3448 | M: mporter@kernel.crashing.org | 3448 | M: mporter@kernel.crashing.org |
| 3449 | W: http://www.penguinppc.org/ | 3449 | W: http://www.penguinppc.org/ |
| 3450 | L: linuxppc-dev@ozlabs.org | 3450 | L: linuxppc-dev@ozlabs.org |
| 3451 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc.git | 3451 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git |
| 3452 | S: Maintained | 3452 | S: Maintained |
| 3453 | 3453 | ||
| 3454 | LINUX FOR POWERPC EMBEDDED XILINX VIRTEX | 3454 | LINUX FOR POWERPC EMBEDDED XILINX VIRTEX |