diff --git a/[refs] b/[refs] index 422da08a1eb7..91b16833bf64 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5351684f435427a68e1e02e9b592559997cd3620 +refs/heads/master: e0cca11ba60fc03475a357f3b213db95c47881b5 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index e6dd8da90ade..17ed481dd768 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -1008,7 +1008,7 @@ M: Marek Vasut L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained F: arch/arm/mach-pxa/vpac270.c -F: arch/arm/mach-pxa/include/mach-pxa/vpac270.h +F: arch/arm/mach-pxa/include/mach/vpac270.h ARM/ZIPIT Z2 SUPPORT M: Marek Vasut