On Mon, Jan 28, 2013 at 09:23:09PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the usb tree got a conflict in > drivers/usb/musb/omap2430.c between commit 148e11349b0c ("usb: Convert to > devm_ioremap_resource()") from the driver-core tree and commit > ca784be36cc7 ("usb: start using the control module driver") from the usb > tree. > > I fixed it up (the latter removed the code modified by the former, so I > did that) and can carry the fix as necessary (no action is required). Looks good, thanks. greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html