The following commit has been merged in the linux branch: commit 941500954470e04679ff6e3cff0f82d8dbd2b6c3 Author: Hubert Feurstein hubert.feurstein@contec.at Date: Wed Oct 7 08:36:07 2009 +0100

ARM: 5749/1: ep93xx/micro9: Update maintainer

Update Contec Micro9 maintainer and add entry in MAINTAINERS

Cc: Ryan Mallon ryan@bluewatersys.com

Requires: 5744/1 Signed-off-by: Hubert Feurstein hubert.feurstein@contec.at Acked-by: H Hartley Sweeten hsweeten@visionengravers.com Acked-by: Manfred Gruber m.gruber@tirol.com Signed-off-by: Russell King rmk+kernel@arm.linux.org.uk

diff --git a/MAINTAINERS b/MAINTAINERS index 09a2028..1401a85 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -577,6 +577,11 @@ M: Mike Rapoport mike@compulab.co.il L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained

+ARM/CONTEC MICRO9 MACHINE SUPPORT +M: Hubert Feurstein hubert.feurstein@contec.at +S: Maintained +F: arch/arm/mach-ep93xx/micro9.c + ARM/CORGI MACHINE SUPPORT M: Richard Purdie rpurdie@rpsys.net S: Maintained diff --git a/arch/arm/mach-ep93xx/micro9.c b/arch/arm/mach-ep93xx/micro9.c index 0a313e8..72e7a7d 100644 --- a/arch/arm/mach-ep93xx/micro9.c +++ b/arch/arm/mach-ep93xx/micro9.c @@ -2,7 +2,9 @@ * linux/arch/arm/mach-ep93xx/micro9.c * * Copyright (C) 2006 Contec Steuerungstechnik & Automation GmbH - * Manfred Gruber manfred.gruber@contec.at + * Manfred Gruber m.gruber@tirol.com + * Copyright (C) 2009 Contec Steuerungstechnik & Automation GmbH + * Hubert Feurstein hubert.feurstein@contec.at * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -66,7 +68,7 @@ static void __init micro9h_init_machine(void) }

MACHINE_START(MICRO9, "Contec Hypercontrol Micro9-H") - /* Maintainer: Manfred Gruber manfred.gruber@contec.at */ + /* Maintainer: Hubert Feurstein hubert.feurstein@contec.at */ .phys_io = EP93XX_APB_PHYS_BASE, .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc, .boot_params = EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100, @@ -88,7 +90,7 @@ static void __init micro9m_init_machine(void) }

MACHINE_START(MICRO9M, "Contec Hypercontrol Micro9-M") - /* Maintainer: Manfred Gruber manfred.gruber@contec.at */ + /* Maintainer: Hubert Feurstein hubert.feurstein@contec.at */ .phys_io = EP93XX_APB_PHYS_BASE, .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc, .boot_params = EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100, @@ -110,7 +112,7 @@ static void __init micro9l_init_machine(void) }

MACHINE_START(MICRO9L, "Contec Hypercontrol Micro9-L") - /* Maintainer: Manfred Gruber manfred.gruber@contec.at */ + /* Maintainer: Hubert Feurstein hubert.feurstein@contec.at */ .phys_io = EP93XX_APB_PHYS_BASE, .io_pg_offst = ((EP93XX_APB_VIRT_BASE) >> 18) & 0xfffc, .boot_params = EP93XX_SDCE3_PHYS_BASE_SYNC + 0x100,