aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-06-06 14:21:25 -0400
committerIngo Molnar <mingo@elte.hu>2009-06-06 14:21:28 -0400
commit75b5032212641f6d38ac041416945e70da833b68 (patch)
treebb827401e00c1681a29e75ade3b4ecc903df1a54 /MAINTAINERS
parent0b73da3f40128eab6ca2a07508f424029a1edaeb (diff)
parentb87297fb405ef13cac375f202d114323b076a56d (diff)
Merge branch 'linus' into perfcounters/core
Merge reason: Pick up the latest fixes before the -v8 perfcounters release. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS11
1 files changed, 10 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 85563a4627e8..fd24af2ff326 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -624,6 +624,7 @@ M: paulius.zaleckas@teltonika.lt
624L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) 624L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
625T: git git://gitorious.org/linux-gemini/mainline.git 625T: git git://gitorious.org/linux-gemini/mainline.git
626S: Maintained 626S: Maintained
627F: arch/arm/mach-gemini/
627 628
628ARM/EBSA110 MACHINE SUPPORT 629ARM/EBSA110 MACHINE SUPPORT
629P: Russell King 630P: Russell King
@@ -650,6 +651,7 @@ P: Paulius Zaleckas
650M: paulius.zaleckas@teltonika.lt 651M: paulius.zaleckas@teltonika.lt
651L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) 652L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
652S: Maintained 653S: Maintained
654F: arch/arm/mm/*-fa*
653 655
654ARM/FOOTBRIDGE ARCHITECTURE 656ARM/FOOTBRIDGE ARCHITECTURE
655P: Russell King 657P: Russell King
@@ -1540,6 +1542,13 @@ W: http://www.fi.muni.cz/~kas/cosa/
1540S: Maintained 1542S: Maintained
1541F: drivers/net/wan/cosa* 1543F: drivers/net/wan/cosa*
1542 1544
1545CPMAC ETHERNET DRIVER
1546P: Florian Fainelli
1547M: florian@openwrt.org
1548L: netdev@vger.kernel.org
1549S: Maintained
1550F: drivers/net/cpmac.c
1551
1543CPU FREQUENCY DRIVERS 1552CPU FREQUENCY DRIVERS
1544P: Dave Jones 1553P: Dave Jones
1545M: davej@redhat.com 1554M: davej@redhat.com
@@ -2249,7 +2258,7 @@ P: Li Yang
2249M: leoli@freescale.com 2258M: leoli@freescale.com
2250P: Zhang Wei 2259P: Zhang Wei
2251M: zw@zh-kernel.org 2260M: zw@zh-kernel.org
2252L: linuxppc-embedded@ozlabs.org 2261L: linuxppc-dev@ozlabs.org
2253L: linux-kernel@vger.kernel.org 2262L: linux-kernel@vger.kernel.org
2254S: Maintained 2263S: Maintained
2255F: drivers/dma/fsldma.* 2264F: drivers/dma/fsldma.*