aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2010-12-17 09:16:46 -0500
committerTejun Heo <tj@kernel.org>2010-12-17 09:16:46 -0500
commit275c8b93288ef0c2281e414e069ea8ed4bad03f7 (patch)
treedf906ef901d7719d66944921c7436f5db718dc2f /MAINTAINERS
parent909ea96468096b07fbb41aaf69be060d92bd9271 (diff)
parent8f1d97c79eb65de1d05799d6b81d79cd94169114 (diff)
Merge branch 'this_cpu_ops' into for-2.6.38
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS16
1 files changed, 12 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index abcc9cae0100..cc27793e8756 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -559,14 +559,14 @@ W: http://maxim.org.za/at91_26.html
559S: Maintained 559S: Maintained
560 560
561ARM/BCMRING ARM ARCHITECTURE 561ARM/BCMRING ARM ARCHITECTURE
562M: Leo Chen <leochen@broadcom.com> 562M: Jiandong Zheng <jdzheng@broadcom.com>
563M: Scott Branden <sbranden@broadcom.com> 563M: Scott Branden <sbranden@broadcom.com>
564L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 564L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
565S: Maintained 565S: Maintained
566F: arch/arm/mach-bcmring 566F: arch/arm/mach-bcmring
567 567
568ARM/BCMRING MTD NAND DRIVER 568ARM/BCMRING MTD NAND DRIVER
569M: Leo Chen <leochen@broadcom.com> 569M: Jiandong Zheng <jdzheng@broadcom.com>
570M: Scott Branden <sbranden@broadcom.com> 570M: Scott Branden <sbranden@broadcom.com>
571L: linux-mtd@lists.infradead.org 571L: linux-mtd@lists.infradead.org
572S: Maintained 572S: Maintained
@@ -815,7 +815,7 @@ F: drivers/mmc/host/msm_sdcc.c
815F: drivers/mmc/host/msm_sdcc.h 815F: drivers/mmc/host/msm_sdcc.h
816F: drivers/serial/msm_serial.h 816F: drivers/serial/msm_serial.h
817F: drivers/serial/msm_serial.c 817F: drivers/serial/msm_serial.c
818T: git git://codeaurora.org/quic/kernel/dwalker/linux-msm.git 818T: git git://codeaurora.org/quic/kernel/davidb/linux-msm.git
819S: Maintained 819S: Maintained
820 820
821ARM/TOSA MACHINE SUPPORT 821ARM/TOSA MACHINE SUPPORT
@@ -5942,7 +5942,6 @@ F: include/linux/tty.h
5942 5942
5943TULIP NETWORK DRIVERS 5943TULIP NETWORK DRIVERS
5944M: Grant Grundler <grundler@parisc-linux.org> 5944M: Grant Grundler <grundler@parisc-linux.org>
5945M: Kyle McMartin <kyle@mcmartin.ca>
5946L: netdev@vger.kernel.org 5945L: netdev@vger.kernel.org
5947S: Maintained 5946S: Maintained
5948F: drivers/net/tulip/ 5947F: drivers/net/tulip/
@@ -6594,6 +6593,15 @@ F: include/linux/mfd/wm8400*
6594F: include/sound/wm????.h 6593F: include/sound/wm????.h
6595F: sound/soc/codecs/wm* 6594F: sound/soc/codecs/wm*
6596 6595
6596WORKQUEUE
6597M: Tejun Heo <tj@kernel.org>
6598L: linux-kernel@vger.kernel.org
6599T: git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git
6600S: Maintained
6601F: include/linux/workqueue.h
6602F: kernel/workqueue.c
6603F: Documentation/workqueue.txt
6604
6597X.25 NETWORK LAYER 6605X.25 NETWORK LAYER
6598M: Andrew Hendry <andrew.hendry@gmail.com> 6606M: Andrew Hendry <andrew.hendry@gmail.com>
6599L: linux-x25@vger.kernel.org 6607L: linux-x25@vger.kernel.org