diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-13 04:56:24 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-13 04:56:24 -0400 |
| commit | 74b8721099992b76d3faff78cb8a5d13c65c3529 (patch) | |
| tree | 2c9971160051cae98237715f791ce2b93a0720b5 /MAINTAINERS | |
| parent | 4bddaf66093ce0e0c1fce505f091f4cd52e73e2e (diff) | |
| parent | baffe1699c68da5040de6b274054adc995795782 (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 | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 27299d139478..5a2387d13339 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -1000,6 +1000,20 @@ W: http://www.arm.linux.org.uk/ | |||
| 1000 | S: Maintained | 1000 | S: Maintained |
| 1001 | F: arch/arm/vfp/ | 1001 | F: arch/arm/vfp/ |
| 1002 | 1002 | ||
| 1003 | ARM/VOIPAC PXA270 SUPPORT | ||
| 1004 | M: Marek Vasut <marek.vasut@gmail.com> | ||
| 1005 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | ||
| 1006 | S: Maintained | ||
| 1007 | F: arch/arm/mach-pxa/vpac270.c | ||
| 1008 | F: arch/arm/mach-pxa/include/mach-pxa/vpac270.h | ||
| 1009 | |||
| 1010 | ARM/ZIPIT Z2 SUPPORT | ||
| 1011 | M: Marek Vasut <marek.vasut@gmail.com> | ||
| 1012 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | ||
| 1013 | S: Maintained | ||
| 1014 | F: arch/arm/mach-pxa/z2.c | ||
| 1015 | F: arch/arm/mach-pxa/include/mach-pxa/z2.h | ||
| 1016 | |||
| 1003 | ASC7621 HARDWARE MONITOR DRIVER | 1017 | ASC7621 HARDWARE MONITOR DRIVER |
| 1004 | M: George Joseph <george.joseph@fairview5.com> | 1018 | M: George Joseph <george.joseph@fairview5.com> |
| 1005 | L: lm-sensors@lm-sensors.org | 1019 | L: lm-sensors@lm-sensors.org |