Messages in this thread | | | Date | Wed, 12 Sep 2012 15:37:43 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the usb tree with the usb.current tree |
| |
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 [unhandled content-type:application/pgp-signature] | |