Merge branch 'heads/fixes' into for-next

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

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/boot/dts/dbx5x0.dtsi
index 3e0aa13487b3d73fc6b661702e28a7d80a97d3cc,aaa63d0a80968b20abd4660492fb2af1ed463072..b6bc4ff17f26481be92cff13ab9d2e46880ead41
--- 1/arch/arm/boot/dts/dbx5x0.dtsi
--- 2/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>;

diff --cc arch/arm/mach-omap2/timer.c
Simple merge

diff --cc arch/arm/mach-ux500/board-mop500.c
Simple merge

diff --cc arch/arm/mach-ux500/cpu-db8500.c
Simple merge