diff --git a/[refs] b/[refs] index 9359993ff117..ff4b804f4e66 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9c695203a7ddbe49dba5f22f4c941d24f47475df +refs/heads/master: 482ce512c543f3b30ab881702fa997e71252e604 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 6c73b3bc7f34..ff5a63cb77e4 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -896,11 +896,13 @@ S: Maintained ARM/SAMSUNG ARM ARCHITECTURES M: Ben Dooks +M: Kukjin Kim L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) W: http://www.fluff.org/ben/linux/ S: Maintained -F: arch/arm/plat-s3c/ +F: arch/arm/plat-samsung/ F: arch/arm/plat-s3c24xx/ +F: arch/arm/plat-s5p/ ARM/S3C2410 ARM ARCHITECTURE M: Ben Dooks