Hi,

On Tue, Apr 02, 2013 at 05:11:43PM +1100, Stephen Rothwell wrote:
> Hi Felipe,
> 
> Today's linux-next merge of the usb-gadget tree got a conflict in
> drivers/usb/chipidea/udc.c between commit adf0f735e61a ("usb: chipidea:
> move debug files creation/removal to the core") from the usb tree and
> commit dc9e2873b740 ("usb: chipidea: let udc-core manage gadget->dev")
> from the usb-gadget tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

looks alright to me, thank you.

-- 
balbi