Subject: linux-next: manual merge of the mmc-uh tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 10 Oct 2014 12:58:09 +1100

Hi Ulf,

Today's linux-next merge of the mmc-uh tree got a conflict in
arch/arm/boot/dts/exynos5420-arndale-octa.dts between commit
aaa25a5a33cb ("ARM: dts: unuse the slot-node and deprecate the
supports-highspeed for dw-mmc in exynos") from Linus' tree and commit
583f958b8a23 ("ARM: dts: fix MMC2 regulators for Exynos5420 Arndale
Octa board") from the mmc-uh tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    [email-masked]

diff --cc arch/arm/boot/dts/exynos5420-arndale-octa.dts
index 75080996ec76,1255d833d576..000000000000
--- a/arch/arm/boot/dts/exynos5420-arndale-octa.dts
+++ b/arch/arm/boot/dts/exynos5420-arndale-octa.dts
@@@ -69,9 -74,13 +69,10 @@@
  		samsung,dw-mshc-ddr-timing = <1 2>;
  		pinctrl-names = "default";
  		pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>;
- 		vmmc-supply = <&ldo10_reg>;
+ 		vmmc-supply = <&ldo19_reg>;
+ 		vqmmc-supply = <&ldo13_reg>;
 -
 -		slot@0 {
 -			reg = <0>;
 -			bus-width = <4>;
 -		};
 +		bus-width = <4>;
 +		cap-sd-highspeed;
  	};
  
  	hsi2c_4: i2c@12CA0000 {