Merge branch 'origin' into for-linus

Conflicts:
	MAINTAINERS

diff --cc MAINTAINERS
index 15865e9e5b064e86975f578a7e40fc4ee7480d26,e797c4d48cf10775a680abf5577eb28fae66e842..c450f3abb8c9b5f1fb037b4788665419c0e1238b
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -682,9 -677,16 +677,16 @@@ S:       Maintaine
  
  ARM/INTEL IXP23XX ARM ARCHITECTURE
  M:    Lennert Buytenhek <[email protected]>
- L:    [email protected]
+ L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  
 -L:    [email protected]
+ ARM/INTEL IXP4XX ARM ARCHITECTURE
+ M:    Imre Kaloz <[email protected]>
+ M:    Krzysztof Halasa <[email protected]>
++L:    [email protected] (moderated for non-subscribers)
+ S:    Maintained
+ F:    arch/arm/mach-ixp4xx/
+ 
  ARM/INTEL XSC3 (MANZANO) ARM CORE
  M:    Lennert Buytenhek <[email protected]>
  M:    Dan Williams <[email protected]>

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