summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-03-14 22:26:30 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-03-14 22:26:30 +0000
commit5821c95ffbfd368194927a4f7803125c5af8857c (patch)
tree87dccb04c93d3a7c0af704a0db07e496e76a7431 /MAINTAINERS
parent8688a1a8637c6b833b9b70148809db4538352d2e (diff)
parent9a9fb12a4832bdf22751e21df298ef3559643b43 (diff)
downloadlinux-3.10-5821c95ffbfd368194927a4f7803125c5af8857c.tar.gz
linux-3.10-5821c95ffbfd368194927a4f7803125c5af8857c.tar.bz2
linux-3.10-5821c95ffbfd368194927a4f7803125c5af8857c.zip
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--MAINTAINERS3
1 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 560ecce38ff..b64776c4aee 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5658,7 +5658,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