Messages in this thread | | | Date | Mon, 20 May 2013 10:21:59 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the usb.current tree with Linus' tree |
| |
Hi Greg,
Today's linux-next merge of the usb.current tree got a conflict in drivers/usb/host/ohci-nxp.c between commit bb522812a1a6 ("drivers/usb/host: don't check resource with devm_ioremap_resource") from Linus' tree and commit b3517d5de80e ("usb: ohci: fix goto wrong tag in err case") from the usb.current tree.
The former remove a bit of code modified by the latter, so I did that and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |