summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorCesar Eduardo Barros <cesarb@cesarb.net>2013-01-04 15:35:17 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-01-04 16:11:46 -0800
commit934455d7af23775f935ba77cd8ca9468e4f45128 (patch)
tree0893370bd6d645b13e3ca2a26d6d39384962b4ab /MAINTAINERS
parent7101b795f30ec7da14f6a10820342c866597dc54 (diff)
downloadlinux-934455d7af23775f935ba77cd8ca9468e4f45128.tar.bz2
MAINTAINERS: remove arch/arm/plat-s5p/
These files were merged into plat-samsung. Signed-off-by: Cesar Eduardo Barros <cesarb@cesarb.net> Cc: Ben Dooks <ben-linux@fluff.org> Acked-by: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS4
1 files changed, 1 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index c23d7e7afeff..9f4925932a20 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1092,7 +1092,6 @@ W: http://www.fluff.org/ben/linux/
S: Maintained
F: arch/arm/plat-samsung/
F: arch/arm/plat-s3c24xx/
-F: arch/arm/plat-s5p/
F: arch/arm/mach-s3c24*/
F: arch/arm/mach-s3c64xx/
F: drivers/*/*s3c2410*
@@ -1123,7 +1122,6 @@ M: Sylwester Nawrocki <s.nawrocki@samsung.com>
L: linux-arm-kernel@lists.infradead.org
L: linux-media@vger.kernel.org
S: Maintained
-F: arch/arm/plat-s5p/dev-fimc*
F: arch/arm/plat-samsung/include/plat/*fimc*
F: drivers/media/platform/s5p-fimc/
@@ -1134,7 +1132,7 @@ M: Jeongtae Park <jtp.park@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: arch/arm/plat-samsung/s5p-dev-mfc.c
F: drivers/media/platform/s5p-mfc/
ARM/SAMSUNG S5P SERIES TV SUBSYSTEM SUPPORT