Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/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

diff --cc MAINTAINERS
index 8f6297881077993c9618b4ee106d527ba19beeab,7bf7045337e1af89723ecfdfdf10d6c5b56ae6f2..7c1c0b05b298f069756c1dc119083e75f0e74a24
--- 1/MAINTAINERS
--- 2/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>