diff --git a/[refs] b/[refs] index 5dd117de0945..0bb17c6956d2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 07a092fa740442415a982a659316a3ab15d7e33e +refs/heads/master: 3ce4ccb630ceac293d2a4ff5e72d0edc22b319ab diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 8695e30eb5b7..77ed965649dd 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -1128,6 +1128,14 @@ F: arch/arm/mach-s5pv210/mach-goni.c F: arch/arm/mach-exynos/mach-universal_c210.c F: arch/arm/mach-exynos/mach-nuri.c +ARM/SAMSUNG S5P SERIES 2D GRAPHICS ACCELERATION (G2D) SUPPORT +M: Kyungmin Park +M: Kamil Debski +L: linux-arm-kernel@lists.infradead.org +L: linux-media@vger.kernel.org +S: Maintained +F: drivers/media/platform/s5p-g2d/ + ARM/SAMSUNG S5P SERIES FIMC SUPPORT M: Kyungmin Park M: Sylwester Nawrocki