diff --git a/[refs] b/[refs] index df1034e93221..43f9211429e8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 95b90afec301f050f72740e8696f7cce8a37db5a +refs/heads/master: 10ffa96407b230ea7fc72abd32c6795183f38fa1 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 297a052824fd..44757a0557cf 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -1010,6 +1010,15 @@ L: linux-samsung-soc@vger.kernel.org (moderated for non-subscribers) S: Maintained F: arch/arm/mach-s5p*/ +ARM/SAMSUNG MOBILE MACHINE SUPPORT +M: Kyungmin Park +L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) +S: Maintained +F: arch/arm/mach-s5pv210/mach-aquila.c +F: arch/arm/mach-s5pv210/mach-goni.c +F: arch/arm/mach-exynos4/mach-universal_c210.c +F: arch/arm/mach-exynos4/mach-nuri.c + ARM/SAMSUNG S5P SERIES FIMC SUPPORT M: Kyungmin Park M: Sylwester Nawrocki