summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-10-18 15:20:21 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-10-18 15:20:21 +0100
commit7f9c7e28119cf21ae1a035240da3705647d0d06a (patch)
treec0a1568e21c5ce6cd4112e44071040a3e611a9ec /MAINTAINERS
parent4af8f24d99d119ed68b27d1b0bd6f2ab2b23ed1b (diff)
parentb476ef059ec9e49d4f2a4280b862b446ef3866e8 (diff)
downloadlinux-7f9c7e28119cf21ae1a035240da3705647d0d06a.tar.gz
linux-7f9c7e28119cf21ae1a035240da3705647d0d06a.tar.bz2
linux-7f9c7e28119cf21ae1a035240da3705647d0d06a.zip
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS5
1 files changed, 5 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 0c737460f7e9..e54f922075e2 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -992,6 +992,11 @@ M: Lennert Buytenhek <kernel@wantstofly.org>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
S: Maintained
+ARM/TETON BGA MACHINE SUPPORT
+M: Mark F. Brown <mark.brown314@gmail.com>
+L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S: Maintained
+
ARM/THECUS N2100 MACHINE SUPPORT
M: Lennert Buytenhek <kernel@wantstofly.org>
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)