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@xxxxxxxxxxxxxxxx http://www.canb.auug.org.au/~sfr/
Attachment:
pgphUJr20zgK4.pgp
Description: PGP signature