diff --git a/[refs] b/[refs] index 91b16833bf64..8d29da4f0c9a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e0cca11ba60fc03475a357f3b213db95c47881b5 +refs/heads/master: 6ab2a85545c696c552cce4fe6c8cbfee287c63ba diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 17ed481dd768..82aff743c00f 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -1015,7 +1015,7 @@ M: Marek Vasut L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained F: arch/arm/mach-pxa/z2.c -F: arch/arm/mach-pxa/include/mach-pxa/z2.h +F: arch/arm/mach-pxa/include/mach/z2.h ASC7621 HARDWARE MONITOR DRIVER M: George Joseph