diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-14 18:26:30 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-14 18:26:30 -0400 |
| commit | 5821c95ffbfd368194927a4f7803125c5af8857c (patch) | |
| tree | 87dccb04c93d3a7c0af704a0db07e496e76a7431 /MAINTAINERS | |
| parent | 8688a1a8637c6b833b9b70148809db4538352d2e (diff) | |
| parent | 9a9fb12a4832bdf22751e21df298ef3559643b43 (diff) | |
Merge branch 'davinci-next' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci into devel-stable
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 560ecce38ff5..b64776c4aeea 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -5658,7 +5658,8 @@ F: arch/arm/mach-s3c2410/bast-ide.c | |||
| 5658 | F: arch/arm/mach-s3c2410/bast-irq.c | 5658 | F: arch/arm/mach-s3c2410/bast-irq.c |
| 5659 | 5659 | ||
| 5660 | TI DAVINCI MACHINE SUPPORT | 5660 | TI DAVINCI MACHINE SUPPORT |
| 5661 | M: Kevin Hilman <khilman@deeprootsystems.com> | 5661 | M: Sekhar Nori <nsekhar@ti.com> |
| 5662 | M: Kevin Hilman <khilman@ti.com> | ||
| 5662 | L: davinci-linux-open-source@linux.davincidsp.com (subscribers-only) | 5663 | L: davinci-linux-open-source@linux.davincidsp.com (subscribers-only) |
| 5663 | Q: http://patchwork.kernel.org/project/linux-davinci/list/ | 5664 | Q: http://patchwork.kernel.org/project/linux-davinci/list/ |
| 5664 | S: Supported | 5665 | S: Supported |