From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 27 Mar 2013 21:37:45 +0000 (+0100)
Subject: Merge branch 'heads/fixes' into for-next
X-Git-Tag: next-20130402~15^2~3
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=94c97af463734d69222815c59919639e288bf834;p=karo-tx-linux.git

Merge branch 'heads/fixes' into for-next

Conflicts:
	arch/arm/boot/dts/dbx5x0.dtsi
---

94c97af463734d69222815c59919639e288bf834
diff --cc arch/arm/boot/dts/dbx5x0.dtsi
index 3e0aa13487b3,aaa63d0a8096..b6bc4ff17f26
--- a/arch/arm/boot/dts/dbx5x0.dtsi
+++ b/arch/arm/boot/dts/dbx5x0.dtsi
@@@ -191,8 -191,8 +191,8 @@@
  
  		prcmu: prcmu@80157000 {
  			compatible = "stericsson,db8500-prcmu";
- 			reg = <0x80157000 0x2000>;
- 			reg-names = "prcmu";
 -			reg = <0x80157000 0x1000>, <0x801b0000 0x8000>, <0x801b8000 0x1000>;
++			reg = <0x80157000 0x2000>, <0x801b0000 0x8000>, <0x801b8000 0x1000>;
+ 			reg-names = "prcmu", "prcmu-tcpm", "prcmu-tcdm";
  			interrupts = <0 47 0x4>;
  			#address-cells = <1>;
  			#size-cells = <1>;