Messages in this thread | | | Date | Thu, 19 Apr 2012 15:14:02 +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/host/ehci-fsl.c between commit f941f6922533 ("USB: ehci-fsl: Fix kernel crash on mpc5121e") from the usb.current tree and commit 58c559e6509f ("fsl/usb: Add controller version based ULPI and UTMI phy support") from the usb tree.
I fixed it up (using the pdata assignment from the latter commit) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |