Merge branch 'next/cleanup' into for-next

Conflicts:
	drivers/net/ethernet/cadence/Kconfig

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/arm-soc-for-next-contents.txt
index 4af488c6161aa339e8045006b0b1b8b27aa2877f,0000000000000000000000000000000000000000..7bfca51161309c1ba694cfc4a5bfe497e7f61abb
mode 100644,000000..100644
--- 1/arch/arm/arm-soc-for-next-contents.txt
--- /dev/null
+++ b/arch/arm/arm-soc-for-next-contents.txt
@@@ -1,12 -1,0 +1,15 @@@
 +This file lists all branches that are pulled into the for-next branch
 +of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git
 +and their external dependencies.
 +
 +Currently there are no dependencies.
 +
++next/cleanup
++  at91/ioremap                git://github.com/at91linux/linux-at91.git for-arnd-3.3-ioremap
++
 +next/drivers
 +  drivers/macb-gem    git://github.com/jamieiles/linux-2.6-ji.git macb-gem
 +  drivers/pxa-gpio    git://github.com/hzhuang1/linux.git gpio
 +
 +next/move
 +  imx/move            git://git.pengutronix.de/git/imx/linux-2.6.git mx5-merge

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --cc drivers/net/ethernet/cadence/Kconfig
index a2e150059bc78b38796c6007a6e7d5cb5a7f596d,b48378a41e492ce3df245214235c25b901a436c1..db931916da08c8ddfd26b9068a94b7dddd1bfb46
--- 1/drivers/net/ethernet/cadence/Kconfig
--- 2/drivers/net/ethernet/cadence/Kconfig
+++ b/drivers/net/ethernet/cadence/Kconfig
@@@ -5,8 -5,9 +5,9 @@@
  config HAVE_NET_MACB
        bool
  
 -config NET_ATMEL
 -      bool "Atmel devices"
 +config NET_CADENCE
 +      bool "Cadence devices"
+       default y
        depends on HAVE_NET_MACB || (ARM && ARCH_AT91RM9200)
        ---help---
          If you have a network (Ethernet) card belonging to this class, say Y.