diff --git a/[refs] b/[refs] index 2b953de486f1..41b7df6ac392 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d1f28953ca338a9af6d91d5896060179142de0d1 +refs/heads/master: b57fe924740b30cdbaaf20da8b7375f167f6ac35 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 9a80011db083..833f4c6ef038 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -835,13 +835,13 @@ F: arch/arm/mach-pxa/palmte2.c F: arch/arm/mach-pxa/include/mach/palmtc.h F: arch/arm/mach-pxa/palmtc.c -ARM/PALM TREO 680 SUPPORT +ARM/PALM TREO SUPPORT M: Tomas Cech L: linux-arm-kernel@lists.infradead.org W: http://hackndev.com S: Maintained -F: arch/arm/mach-pxa/include/mach/treo680.h -F: arch/arm/mach-pxa/treo680.c +F: arch/arm/mach-pxa/include/mach/palmtreo.h +F: arch/arm/mach-pxa/palmtreo.c ARM/PALMZ72 SUPPORT M: Sergey Lapin