diff --git a/[refs] b/[refs] index 10e7cefff9c7..9e5011b8f73d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 74c32e7234afc4586391c0c0f290d266a3e57fe5 +refs/heads/master: dfdd8cc903288bb2e2ad6731545be3db7304c133 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 751a307dc44e..7bf7045337e1 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -685,6 +685,13 @@ M: Lennert Buytenhek L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) S: Maintained +ARM/INTEL IXP4XX ARM ARCHITECTURE +M: Imre Kaloz +M: Krzysztof Halasa +L: linux-arm-kernel@lists.infradead.org +S: Maintained +F: arch/arm/mach-ixp4xx/ + ARM/INTEL XSC3 (MANZANO) ARM CORE M: Lennert Buytenhek M: Dan Williams