From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 23 Sep 2009 18:25:16 +0000 (-0700)
Subject: Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6
X-Git-Tag: v2.6.32-rc1~153
X-Git-Url: http://ftp.safe.ca/?p=safe%2Fjmp%2Flinux-2.6;a=commitdiff_plain;h=a724eada8c2a7b62463b73ccf73fd0bb6e928aeb

Merge branch 'ixp4xx' of git://git./linux/kernel/git/chris/linux-2.6

* 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6:
  Add MAINTAINERS entry for ARM/INTEL IXP4xx arch support.
  ixp4xx: arch_idle() documentation fixup
  ixp4xx: timer and clocks cleanups
---

a724eada8c2a7b62463b73ccf73fd0bb6e928aeb
diff --cc MAINTAINERS
index 8f62978,7bf7045..7c1c0b0
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -683,9 -682,16 +683,16 @@@ S:	Maintaine
  
  ARM/INTEL IXP23XX ARM ARCHITECTURE
  M:	Lennert Buytenhek <kernel@wantstofly.org>
 -L:	linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:	Maintained
  
+ ARM/INTEL IXP4XX ARM ARCHITECTURE
+ M:	Imre Kaloz <kaloz@openwrt.org>
+ M:	Krzysztof Halasa <khc@pm.waw.pl>
+ L:	linux-arm-kernel@lists.infradead.org
+ S:	Maintained
+ F:	arch/arm/mach-ixp4xx/
+ 
  ARM/INTEL XSC3 (MANZANO) ARM CORE
  M:	Lennert Buytenhek <kernel@wantstofly.org>
  M:	Dan Williams <dan.j.williams@intel.com>