diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-03-15 15:14:43 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-03-15 15:14:43 -0400 |
| commit | 63ae9680564096aecff6f314539c152a6afb75d4 (patch) | |
| tree | d96109562c7e59eec22f9b9d0181a69ce2a364b8 /MAINTAINERS | |
| parent | 8c9e80eeafd55da624552900abe345d62d181856 (diff) | |
| parent | 9ced9f03d12d7539e86b0bff5bc750153c976c34 (diff) | |
Merge remote-tracking branch 'rmk/devel-stable' into linaro-2.6.38
Conflicts:
arch/arm/mach-exynos4/cpufreq.c
arch/arm/mach-exynos4/irq-eint.c
arch/arm/mach-mx5/clock-mx51-mx53.c
arch/arm/mach-ux500/board-mop500-sdi.c
arch/arm/plat-s5p/Makefile
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index f1bc3dc6b36..053cbc5ddf8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5655,7 +5655,8 @@ F: arch/arm/mach-s3c2410/bast-ide.c F: arch/arm/mach-s3c2410/bast-irq.c TI DAVINCI MACHINE SUPPORT -M: Kevin Hilman <khilman@deeprootsystems.com> +M: Sekhar Nori <nsekhar@ti.com> +M: Kevin Hilman <khilman@ti.com> L: davinci-linux-open-source@linux.davincidsp.com (subscribers-only) Q: http://patchwork.kernel.org/project/linux-davinci/list/ S: Supported |