diff --git a/[refs] b/[refs] index 3a65475fd6ff..b63627d75b7f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 89e162afd37caa6acab4e05b6e9e9fad6235381e +refs/heads/master: a990cbd887585a1056b927b3b20de325f14fdf96 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 9820e89c827c..09cbbbb40cd1 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -721,6 +721,12 @@ T: git git://git.berlios.de/gemini-board S: Maintained F: arch/arm/mach-gemini/ +ARM/CSR SIRFPRIMA2 MACHINE SUPPORT +M: Barry Song +L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) +S: Maintained +F: arch/arm/mach-prima2/ + ARM/EBSA110 MACHINE SUPPORT M: Russell King L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)