Subject: linux-next: manual merge of the usb tree with the samsung tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 24 Jul 2014 16:22:32 +1000

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
Documentation/devicetree/bindings/phy/samsung-phy.txt between commit
949ccc3a9363 ("phy: Add support for S5PV210 to the Exynos USB 2.0 PHY
driver") from the samsung tree and commit 016e0d3cb72c ("drivers: phy:
exynos-usb2: add support for Exynos 3250") from the usb 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 Documentation/devicetree/bindings/phy/samsung-phy.txt
index 7dce043a6e29,6099a5c94283..000000000000
--- a/Documentation/devicetree/bindings/phy/samsung-phy.txt
+++ b/Documentation/devicetree/bindings/phy/samsung-phy.txt
@@@ -26,7 -26,7 +26,8 @@@ Samsung S5P/EXYNOS SoC series USB PH
  
  Required properties:
  - compatible : should be one of the listed compatibles:
 +	- "samsung,s5pv210-usb2-phy"
+ 	- "samsung,exynos3250-usb2-phy"
  	- "samsung,exynos4210-usb2-phy"
  	- "samsung,exynos4x12-usb2-phy"
  	- "samsung,exynos5250-usb2-phy"