From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 21 Mar 2013 16:27:05 +0000 (+0100)
Subject: Merge branch 'next/dt' into for-next
X-Git-Tag: next-20130322~14^2~10
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=521ea629d487d1f3db2493a39c9f2fc0890bb5b4;p=karo-tx-linux.git

Merge branch 'next/dt' into for-next

Conflicts:
	arch/arm/boot/dts/snowball.dts
---

521ea629d487d1f3db2493a39c9f2fc0890bb5b4
diff --cc arch/arm/arm-soc-for-next-contents.txt
index 31685fb25a58,000000000000..c304ecb3dc26
mode 100644,000000..100644
--- a/arch/arm/arm-soc-for-next-contents.txt
+++ b/arch/arm/arm-soc-for-next-contents.txt
@@@ -1,49 -1,0 +1,51 @@@
 +for-next contents for 3.10: 
 +Format is a little different from before in an attempt to make it easier to read:
 +
 +<next/* branch>
 +	<topic branch>
 +		<contents>
 +		<...>
 +	<...>
 +
 +next/fixes-non-critical
 +	ux500/dt-fixes
 +		  git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/ux500-dt-fixes
 +
 +next/cleanup
 +	samsung/cleanup-s3c
 +		  git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git next/cleanup-s3c
 +	samsung/cleanup-s5p
 +		  git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git next/cleanup-s5p
 +	clksrc/cleanup
 +		  git://sources.calxeda.com/kernel/linux.git tags/clksrc-cleanup-for-3.10
 +	at91/cleanup
 +		  git://github.com/at91linux/linux-at91.git tags/at91-soc
 +
 +next/multiplatform
 +	nomadik/multiplatform
 +		git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git tags/nomadik-multiplatform
 +	spear/multiplatform
 +		patches <1363106816-9603-1-git-send-email-arnd@arndb.de>
 +	cns3xxx/multiplatform
 +		patches <1363299271-8283-1-git-send-email-arnd@arndb.de>
 +
 +next/dt
 +	mvebu/dt
 +		git://git.infradead.org/users/jcooper/linux.git tags/mvebu_dt_for_v3.10
++	at91/dt
++		  git://github.com/at91linux/linux-at91.git tags/at91-dt
 +
 +next/drivers
 +	samsung/timer
 +		git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git next/timer-samsung
 +		depends on samsung/cleanup-s3c
 +	samsung/irq-s3c24xx
 +		git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git next/irq-s3c24xx
 +	samsung/pinctrl-exynos
 +		git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git next/pinctrl-exynos
 +	at91/lcdfb
 +		git://github.com/at91linux/linux-at91.git tags/at91-driversLCD
 +
 +next/soc
 +	prima2/soc
 +		patches <1363590279-5656-1-git-send-email-Barry.Song@csr.com>
diff --cc arch/arm/boot/dts/snowball.dts
index b095e85d93c8,d3ec32f6b790..db5db24fd544
--- a/arch/arm/boot/dts/snowball.dts
+++ b/arch/arm/boot/dts/snowball.dts
@@@ -298,11 -298,7 +298,11 @@@
  				};
  			};
  
- 			ab8500@5 {
+ 			ab8500 {
 +				ab8500-gpio {
 +					compatible = "stericsson,ab8500-gpio";
 +				};
 +
  				ab8500-regulators {
  					ab8500_ldo_aux1_reg: ab8500_ldo_aux1 {
  						regulator-name = "V-DISPLAY";