diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-03-25 16:44:07 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-03-25 16:44:07 -0400 |
| commit | 0cd3fd78e5951c1631ee60a2026603d63c671d98 (patch) | |
| tree | 5569b2135a8920aee9b4456691e995a499c31131 /MAINTAINERS | |
| parent | a90b3dcb115ec561b6bae4874e63ddc51720128b (diff) | |
| parent | 9ced9f03d12d7539e86b0bff5bc750153c976c34 (diff) | |
Merge commit '9ced9f0' (rmk/devel-stable) into linaro-2.6.38
Conflicts:
arch/arm/mach-mxs/gpio.c
drivers/usb/gadget/fsl_mxc_udc.c
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 |