linux-next: manual merge of the usb-gadget tree with the driver-core tree

From: Stephen Rothwell
Date: Tue Nov 18 2014 - 02:12:34 EST

Hi Felipe,

Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/dwc2/gadget.c between commit 7c3e90537b74 ("usb: dwc2: drop
owner assignment from platform_drivers") from the driver-core tree and
commit 117777b2c3bb ("usb: dwc2: Move gadget probe function into
platform code") from the usb-gadget tree.

I fixed it up (the latter removed the code changed by the former, so I
did that) and can carry the fix as necessary (no action is required).

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgpPPGEaSj_JI.pgp
Description: OpenPGP digital signature