From: Russell King Date: Fri, 2 Oct 2009 21:31:04 +0000 (+0100) Subject: Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/xscaleiop X-Git-Tag: v2.6.32-rc3~11^2~5 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=534d0c92cfc45174fbfeca2f3dd54c3ce332725e;p=linux-2.6-block.git Merge branch 'fixes' of git://git./linux/kernel/git/djbw/xscaleiop Conflicts: MAINTAINERS --- 534d0c92cfc45174fbfeca2f3dd54c3ce332725e diff --cc MAINTAINERS index c450f3abb8c9,e2f7199c532f..e7047c3743a8 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -645,25 -630,25 +645,25 @@@ F: arch/arm/mach-sa1100/include/mach/jo ARM/INTEL IOP32X ARM ARCHITECTURE M: Lennert Buytenhek M: Dan Williams -L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) +L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) - S: Supported + S: Maintained ARM/INTEL IOP33X ARM ARCHITECTURE M: Dan Williams -L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) +L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) - S: Supported + S: Maintained ARM/INTEL IOP13XX ARM ARCHITECTURE M: Lennert Buytenhek M: Dan Williams -L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) +L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) - S: Supported + S: Maintained ARM/INTEL IQ81342EX MACHINE SUPPORT M: Lennert Buytenhek M: Dan Williams -L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) +L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) - S: Supported + S: Maintained ARM/INTEL IXP2000 ARM ARCHITECTURE M: Lennert Buytenhek @@@ -690,8 -668,8 +690,8 @@@ F: arch/arm/mach-ixp4xx ARM/INTEL XSC3 (MANZANO) ARM CORE M: Lennert Buytenhek M: Dan Williams -L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) +L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) - S: Supported + S: Maintained ARM/IP FABRICS DOUBLE ESPRESSO MACHINE SUPPORT M: Lennert Buytenhek