Merge tag 'asoc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound...

[mv-sheeva.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 3d11fa581bb7d14d0b58a033a0079e4806fbf3c9..5190cf25fd8da03ca9d9bc834064f1e76e001bc3 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1940,7 +1940,7 @@ F:        drivers/connector/
 
 CONTROL GROUPS (CGROUPS)
 M:     Tejun Heo <tj@kernel.org>
-M:     Li Zefan <lizf@cn.fujitsu.com>
+M:     Li Zefan <lizefan@huawei.com>
 L:     containers@lists.linux-foundation.org
 L:     cgroups@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
@@ -2225,13 +2225,16 @@ W:      http://lanana.org/docs/device-list/index.html
 S:     Maintained
 
 DEVICE-MAPPER  (LVM)
-P:     Alasdair Kergon
+M:     Alasdair Kergon <agk@redhat.com>
+M:     dm-devel@redhat.com
 L:     dm-devel@redhat.com
 W:     http://sources.redhat.com/dm
 Q:     http://patchwork.kernel.org/project/dm-devel/list/
+T:     quilt http://people.redhat.com/agk/patches/linux/editing/
 S:     Maintained
 F:     Documentation/device-mapper/
 F:     drivers/md/dm*
+F:     drivers/md/persistent-data/
 F:     include/linux/device-mapper.h
 F:     include/linux/dm-*.h
 
@@ -4804,6 +4807,7 @@ F:        arch/arm/mach-omap2/clockdomain2xxx_3xxx.c
 F:     arch/arm/mach-omap2/clockdomain44xx.c
 
 OMAP AUDIO SUPPORT
+M:     Peter Ujfalusi <peter.ujfalusi@ti.com>
 M:     Jarkko Nikula <jarkko.nikula@bitmer.com>
 L:     alsa-devel@alsa-project.org (subscribers-only)
 L:     linux-omap@vger.kernel.org
@@ -5182,7 +5186,7 @@ F:        kernel/delayacct.c
 PERFORMANCE EVENTS SUBSYSTEM
 M:     Peter Zijlstra <a.p.zijlstra@chello.nl>
 M:     Paul Mackerras <paulus@samba.org>
-M:     Ingo Molnar <mingo@elte.hu>
+M:     Ingo Molnar <mingo@redhat.com>
 M:     Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf/core
 S:     Supported
@@ -5773,6 +5777,12 @@ F:       drivers/media/common/saa7146*
 F:     drivers/media/video/*7146*
 F:     include/media/*7146*
 
+SAMSUNG LAPTOP DRIVER
+M:     Corentin Chary <corentincj@iksaif.net>
+L:     platform-driver-x86@vger.kernel.org
+S:     Maintained
+F:     drivers/platform/x86/samsung-laptop.c
+
 SAMSUNG AUDIO (ASoC) DRIVERS
 M:     Sangbeom Kim <sbkim73@samsung.com>
 L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
@@ -5824,7 +5834,7 @@ S:        Maintained
 F:     drivers/watchdog/sc1200wdt.c
 
 SCHEDULER
-M:     Ingo Molnar <mingo@elte.hu>
+M:     Ingo Molnar <mingo@redhat.com>
 M:     Peter Zijlstra <peterz@infradead.org>
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git sched/core
 S:     Maintained
@@ -7453,8 +7463,7 @@ F:        include/linux/wm97xx.h
 
 WOLFSON MICROELECTRONICS DRIVERS
 M:     Mark Brown <broonie@opensource.wolfsonmicro.com>
-M:     Ian Lartey <ian@opensource.wolfsonmicro.com>
-M:     Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
+L:     patches@opensource.wolfsonmicro.com
 T:     git git://opensource.wolfsonmicro.com/linux-2.6-asoc
 T:     git git://opensource.wolfsonmicro.com/linux-2.6-audioplus
 W:     http://opensource.wolfsonmicro.com/content/linux-drivers-wolfson-devices