diff --git a/[refs] b/[refs] index 5a2b9f9b4f59..cea7340d94cc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 43defb118247b9c72d53328aa366bdb154d5ee98 +refs/heads/master: 60659dd49509f255ad9748411cd4eb3c74a8d8a9 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 5e587fcaf4dc..e839b95b2723 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -1088,6 +1088,7 @@ F: drivers/media/video/s5p-fimc/ ARM/SAMSUNG S5P SERIES Multi Format Codec (MFC) SUPPORT M: Kyungmin Park M: Kamil Debski +M: Jeongtae Park L: linux-arm-kernel@lists.infradead.org L: linux-media@vger.kernel.org S: Maintained