Messages in this thread | | | Date | Wed, 2 Mar 2011 16:57:46 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the usb tree with the omap tree |
| |
Hi Greg,
Today's linux-next merge of the usb tree got a conflict in drivers/usb/musb/musb_core.h between commit 59b479e0985f0b795d68331d6443a7f89c47768d ("omap: Start using CONFIG_SOC_OMAP") from the omap tree and commit da68ccec210c45eb99e461ad31b499b4e7043c41 ("usb: musb: Remove platform context save/restore API") from the usb tree.
The latter removed the code modified by the former, so I did that. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |