diff --git a/[refs] b/[refs] index 31e07a378ce2..26dd3a452483 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5eebebee845c09a4104c6704e9f7db1918ab80de +refs/heads/master: 7101b795f30ec7da14f6a10820342c866597dc54 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 10bf87aa562e..c23d7e7afeff 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -1068,7 +1068,6 @@ M: Russell King L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) W: http://www.arm.linux.org.uk/ S: Maintained -F: arch/arm/common/time-acorn.c F: arch/arm/include/asm/hardware/entry-macro-iomd.S F: arch/arm/include/asm/hardware/ioc.h F: arch/arm/include/asm/hardware/iomd.h