diff --git a/[refs] b/[refs] index cb8b2bdbfd20..6fcc997bfaa0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dd045445f82a9ff38120a5cd7f6117f065285859 +refs/heads/master: ef47d5f02402b4b1183d64edde5e89178794bb9d diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index cf4abddfc8a4..b1c449f66cc3 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -680,6 +680,13 @@ M: sakoman@gmail.com L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) S: Maintained +ARM/H4700 (HP IPAQ HX4700) MACHINE SUPPORT +P: Philipp Zabel +M: philipp.zabel@gmail.com +S: Maintained +F: arch/arm/mach-pxa/hx4700.c +F: arch/arm/mach-pxa/include/mach/hx4700.h + ARM/HP JORNADA 7XX MACHINE SUPPORT P: Kristoffer Ericson M: kristoffer.ericson@gmail.com