From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Thu, 24 Sep 2009 20:22:33 +0000 (+0100)
Subject: Merge branch 'origin' into for-linus
X-Git-Tag: v2.6.32-rc1~49^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=baea7b946f00a291b166ccae7fcfed6c01530cc6;p=pandora-kernel.git

Merge branch 'origin' into for-linus

Conflicts:
	MAINTAINERS
---

baea7b946f00a291b166ccae7fcfed6c01530cc6
diff --cc MAINTAINERS
index 15865e9e5b06,e797c4d48cf1..c450f3abb8c9
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -682,9 -677,16 +677,16 @@@ S:	Maintaine
  
  ARM/INTEL IXP23XX ARM ARCHITECTURE
  M:	Lennert Buytenhek <kernel@wantstofly.org>
- L:	linux-arm-kernel@lists.infradead.org
+ 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
++L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+ 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>