diff --git a/[refs] b/[refs] index 85f87648cce6..0acb20230081 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 52653199d7b02e4c3d4b6ac430de68b83116af0e +refs/heads/master: f556cb078a3a11f6bcb203040fe014caaa6710c4 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 24f3deece17e..f46d8e66333f 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -962,6 +962,13 @@ W: http://www.fluff.org/ben/linux/ S: Maintained F: arch/arm/mach-s3c6410/ +ARM/S5P ARM ARCHITECTURES +M: Kukjin Kim +L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) +L: linux-samsung-soc@vger.kernel.org (moderated for non-subscribers) +S: Maintained +F: arch/arm/mach-s5p*/ + ARM/SHMOBILE ARM ARCHITECTURE M: Paul Mundt M: Magnus Damm