diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-18 12:20:37 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-18 12:20:37 -0400 |
| commit | 6f128fa344833bf8bf076a51d14401661c146470 (patch) | |
| tree | 70049d2b394e86c3c3d06961c155cae45ce47ca7 /MAINTAINERS | |
| parent | 73c583e4e2dd0fbbf2fafe0cc57ff75314fe72df (diff) | |
| parent | 85609c1ccda64af7d7c277469183f20e4f3b69c3 (diff) | |
Merge branch 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci
* 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci: (62 commits)
DaVinci: DM646x - platform changes for vpif capture and display drivers
davinci: DM355 - platform changes for vpfe capture
davinci: DM644x platform changes for vpfe capture
davinci: audio: move tlv320aic33 i2c setup into board files
DaVinci: EDMA: Adding 2 new APIs for allocating/freeing PARAMs
DaVinci: DM365: Adding entries for DM365 IRQ's
DaVinci: DM355: Adding PINMUX entries for DM355 Display
davinci: Handle pinmux conflict between mmc/sd and nor flash
davinci: Add NOR flash support for da850/omap-l138
davinci: Add NAND flash support for DA850/OMAP-L138
davinci: Add MMC/SD support for da850/omap-l138
davinci: Add platform support for da850/omap-l138 GLCD
davinci: Macro to convert GPIO signal to GPIO pin number
davinci: Audio support for DA850/OMAP-L138 EVM
davinci: Audio support for DA830 EVM
davinci: Correct the number of GPIO pins for da850/omap-l138
davinci: Configure MDIO pins for EMAC
DaVinci: DM365: Add Support for new Revision of silicon
DaVinci: DM365: Fix Compilation issue due to PINMUX entry
DaVinci: EDMA: Updating default queue handling
...
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index def1c5da787..e2b9486fd1a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -4653,6 +4653,12 @@ F: arch/arm/mach-s3c2410/ | |||
| 4653 | F: drivers/*/*s3c2410* | 4653 | F: drivers/*/*s3c2410* |
| 4654 | F: drivers/*/*/*s3c2410* | 4654 | F: drivers/*/*/*s3c2410* |
| 4655 | 4655 | ||
| 4656 | TI DAVINCI MACHINE SUPPORT | ||
| 4657 | P: Kevin Hilman | ||
| 4658 | M: davinci-linux-open-source@linux.davincidsp.com | ||
| 4659 | S: Supported | ||
| 4660 | F: arch/arm/mach-davinci | ||
| 4661 | |||
| 4656 | SIS 190 ETHERNET DRIVER | 4662 | SIS 190 ETHERNET DRIVER |
| 4657 | M: Francois Romieu <romieu@fr.zoreil.com> | 4663 | M: Francois Romieu <romieu@fr.zoreil.com> |
| 4658 | L: netdev@vger.kernel.org | 4664 | L: netdev@vger.kernel.org |