diff --git a/[refs] b/[refs] index 2d0b1955a750..3bd898fcab84 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d5703bd35a4c76b0717ea51e2e8aabce341828a1 +refs/heads/master: d192f93cfca6a0aedbf10fa548d8bc17b86275d6 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 7c9fdb0e2974..95e66a420a20 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -913,6 +913,12 @@ W: http://www.digriz.org.uk/ts78xx/kernel S: Maintained F: arch/arm/mach-orion5x/ts78xx-* +ARM/MICREL KS8695 ARCHITECTURE +M: Greg Ungerer +L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) +F: arch/arm/mach-ks8695 +S: Odd Fixes + ARM/MIOA701 MACHINE SUPPORT M: Robert Jarzmik L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)