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

[Felipe Balbi]

On Mon, Sep 08, 2014 at 05:02:12PM +1000, Stephen Rothwell wrote:
> 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).

Thank you, that's the correct fix.

-- 
balbi

Attachment: signature.asc
Description: Digital signature