Subject: linux-next: manual merge of the usb-gadget tree with the usb.current tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 8 Sep 2014 17:02:12 +1000

Hi Felipe,

Today's linux-next merge of the usb-gadget tree got a conflict in
Documentation/devicetree/bindings/usb/mxs-phy.txt between commit
36687e305651 ("doc: dt: mxs-phy: add compatible string for
imx6sx-usbphy") from the usb.current tree and commit d0ee68b59e6a
("usb: phy: mxs: Add VF610 USB PHY support") from the usb-gadget 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/usb/mxs-phy.txt
index 96681c93b86d,fe3eed89e4c3..000000000000
--- a/Documentation/devicetree/bindings/usb/mxs-phy.txt
+++ b/Documentation/devicetree/bindings/usb/mxs-phy.txt
@@@ -5,7 -5,7 +5,8 @@@ Required properties
  	* "fsl,imx23-usbphy" for imx23 and imx28
  	* "fsl,imx6q-usbphy" for imx6dq and imx6dl
  	* "fsl,imx6sl-usbphy" for imx6sl
 +	* "fsl,imx6sx-usbphy" for imx6sx
+ 	* "fsl,vf610-usbphy" for Vybrid vf610
    "fsl,imx23-usbphy" is still a fallback for other strings
  - reg: Should contain registers location and length
  - interrupts: Should contain phy interrupt