Merge branch 'for_linus' of git://cavan.codon.org.uk/platform-drivers-x86

[pandora-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 2014c1f..d498c70 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1085,6 +1085,24 @@ F:       arch/arm/plat-s5p/dev-fimc*
 F:     arch/arm/plat-samsung/include/plat/*fimc*
 F:     drivers/media/video/s5p-fimc/
 
+ARM/SAMSUNG S5P SERIES Multi Format Codec (MFC) SUPPORT
+M:     Kyungmin Park <kyungmin.park@samsung.com>
+M:     Kamil Debski <k.debski@samsung.com>
+L:     linux-arm-kernel@lists.infradead.org
+L:     linux-media@vger.kernel.org
+S:     Maintained
+F:     arch/arm/plat-s5p/dev-mfc.c
+F:     drivers/media/video/s5p-mfc/
+
+ARM/SAMSUNG S5P SERIES TV SUBSYSTEM SUPPORT
+M:     Kyungmin Park <kyungmin.park@samsung.com>
+M:     Tomasz Stanislawski <t.stanislaws@samsung.com>
+L:     linux-arm-kernel@lists.infradead.org
+L:     linux-media@vger.kernel.org
+S:     Maintained
+F:     arch/arm/plat-s5p/dev-tv.c
+F:     drivers/media/video/s5p-tv/
+
 ARM/SHMOBILE ARM ARCHITECTURE
 M:     Paul Mundt <lethal@linux-sh.org>
 M:     Magnus Damm <magnus.damm@gmail.com>
@@ -3209,6 +3227,13 @@ F:       Documentation/ide/
 F:     drivers/ide/
 F:     include/linux/ide.h
 
+IDEAPAD LAPTOP EXTRAS DRIVER
+M:     Ike Panhc <ike.pan@canonical.com>
+L:     platform-driver-x86@vger.kernel.org
+W:     http://launchpad.net/ideapad-laptop
+S:     Maintained
+F:     drivers/platform/x86/ideapad-laptop.c
+
 IDE/ATAPI DRIVERS
 M:     Borislav Petkov <petkovbb@gmail.com>
 L:     linux-ide@vger.kernel.org