Messages in this thread | | | Date | Mon, 28 Jan 2013 21:35:35 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the usb tree with the driver-core tree |
| |
Hi Greg,
Today's linux-next merge of the usb tree got a conflict in drivers/usb/phy/omap-usb2.c between commit 148e11349b0c ("usb: Convert to devm_ioremap_resource()") from the tree and commit ca784be36cc7 ("usb: start using the control module driver") from the usb tree.
I fixed it up (I wasn't sure how, so I effectively dropped the former change) 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] | |