diff --git a/[refs] b/[refs] index 2c437563c7d3..48d9c22fed80 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 85743532a8ffa826edba3d1ca7d8f0dbf3f2a67d +refs/heads/master: f996231b808f889df77561c86c01cee3c45e254e diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index feda2cff24ff..abf4436a3741 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -930,19 +930,12 @@ S: Maintained F: arch/arm/mach-s3c2440/ F: arch/arm/mach-s3c2443/ -ARM/S3C6400 ARM ARCHITECTURE +ARM/S3C64xx ARM ARCHITECTURE M: Ben Dooks L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) W: http://www.fluff.org/ben/linux/ S: Maintained -F: arch/arm/mach-s3c6400/ - -ARM/S3C6410 ARM ARCHITECTURE -M: Ben Dooks -L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) -W: http://www.fluff.org/ben/linux/ -S: Maintained -F: arch/arm/mach-s3c6410/ +F: arch/arm/mach-s3c64xx/ ARM/S5P ARM ARCHITECTURES M: Kukjin Kim