Merge branch 'v4.1-next/dt-samsung' into for-next

Conflicts:
	Documentation/devicetree/bindings/arm/exynos/power_domain.txt

diff --cc Documentation/devicetree/bindings/arm/exynos/power_domain.txt
index 1e097037349c326a22e3f07abb3e3aca9d78d0ce,c47e79be460511ac31916ae77d3465600e3aedbc..5da38c5ed476ee2248432314c0bf886305f6cc13
--- 1/Documentation/devicetree/bindings/arm/exynos/power_domain.txt
--- 2/Documentation/devicetree/bindings/arm/exynos/power_domain.txt
+++ b/Documentation/devicetree/bindings/arm/exynos/power_domain.txt
@@@ -22,8 -22,9 +22,11 @@@ Optional Properties
        - pclkN, clkN: Pairs of parent of input clock and input clock to the
                devices in this power domain. Maximum of 4 pairs (N = 0 to 3)
                are supported currently.
+       - asbN: Clocks required by asynchronous bridges (ASB) present in
+               the power domain. These clock should be enabled during power
+               domain on/off operations.
 +- power-domains: phandle pointing to the parent power domain, for more details
 +               see Documentation/devicetree/bindings/power/power_domain.txt
  
  Node of a device using power domains must have a power-domains property
  defined with a phandle to respective power domain.

diff --cc arch/arm/boot/dts/exynos5420.dtsi
Simple merge