Messages in this thread | | | Date | Fri, 2 Aug 2013 16:38:18 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the usb-gadget tree with the usb tree |
| |
Hi Felipe,
Today's linux-next merge of the usb-gadget tree got a conflict in drivers/usb/host/ehci-tegra.c between commit d4f09e28d7bc ("USB: host: use dev_get_platdata()") from the usb tree and commit d50642794508 ("usb: tegra: host: Remove references to plat data") from the usb-gadget tree.
I fixed it up (the latter just removed the code updated by the former, 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] | |