linux-next: manual merge of the usb tree with the usb.current tree
From: Stephen Rothwell <hidden>
Date: 2012-09-12 05:37:55
Also in:
lkml
Hi Greg,
Today's linux-next merge of the usb tree got a conflict in
drivers/usb/musb/tusb6010.c between commit ff41aaa3b6c1 ("usb: musb:
tusb6010: fix error path in tusb_probe()") from the usb.current tree and
commit 65b3d52d02a5 ("usb: musb: add musb_ida for multi instance
support") from the usb tree.
They both updated the same goto - I used the latter (no action is
required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au Attachments
- (unnamed) [application/pgp-signature] 836 bytes