Merge branch 'origin' into for-linus

Conflicts:
	MAINTAINERS

diff --cc MAINTAINERS
index 15865e9,e797c4d..c450f3a
--- 1/MAINTAINERS
--- 2/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
  
 -L:    linux-arm-kernel@lists.infradead.org
+ 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 (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>

diff --cc arch/arm/kernel/Makefile
Simple merge

diff --cc arch/arm/mach-at91/board-neocore926.c
Simple merge

diff --cc arch/arm/mach-at91/board-sam9rlek.c
Simple merge

diff --cc arch/arm/mm/init.c
Simple merge

diff --cc drivers/i2c/busses/Kconfig
Simple merge

diff --cc drivers/serial/pxa.c
Simple merge

diff --cc drivers/spi/pxa2xx_spi.c
Simple merge

diff --cc drivers/usb/host/ohci-pxa27x.c
Simple merge