From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 28 Nov 2011 18:48:43 +0000 (+0000)
Subject: Merge branch 'next/cleanup' into for-next
X-Git-Tag: next-20111130~89^2~3
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f39abe54f13d6bffe14b7cde720d881b4c68e5df;p=karo-tx-linux.git

Merge branch 'next/cleanup' into for-next

Conflicts:
	drivers/net/ethernet/cadence/Kconfig
---

f39abe54f13d6bffe14b7cde720d881b4c68e5df
diff --cc arch/arm/arm-soc-for-next-contents.txt
index 4af488c6161a,000000000000..7bfca5116130
mode 100644,000000..100644
--- a/arch/arm/arm-soc-for-next-contents.txt
+++ 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 drivers/net/ethernet/cadence/Kconfig
index a2e150059bc7,b48378a41e49..db931916da08
--- a/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.