diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-18 10:20:21 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-18 10:20:21 -0400 |
| commit | 7f9c7e28119cf21ae1a035240da3705647d0d06a (patch) | |
| tree | c0a1568e21c5ce6cd4112e44071040a3e611a9ec /MAINTAINERS | |
| parent | 4af8f24d99d119ed68b27d1b0bd6f2ab2b23ed1b (diff) | |
| parent | b476ef059ec9e49d4f2a4280b862b446ef3866e8 (diff) | |
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-- | MAINTAINERS | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 0c737460f7e..e54f922075e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -992,6 +992,11 @@ M: Lennert Buytenhek <kernel@wantstofly.org> | |||
| 992 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | 992 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) |
| 993 | S: Maintained | 993 | S: Maintained |
| 994 | 994 | ||
| 995 | ARM/TETON BGA MACHINE SUPPORT | ||
| 996 | M: Mark F. Brown <mark.brown314@gmail.com> | ||
| 997 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | ||
| 998 | S: Maintained | ||
| 999 | |||
| 995 | ARM/THECUS N2100 MACHINE SUPPORT | 1000 | ARM/THECUS N2100 MACHINE SUPPORT |
| 996 | M: Lennert Buytenhek <kernel@wantstofly.org> | 1001 | M: Lennert Buytenhek <kernel@wantstofly.org> |
| 997 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | 1002 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) |