On Mon, Jul 02, 2012 at 11:26:39AM +0300, Felipe Balbi wrote: > On Mon, Jul 02, 2012 at 11:22:00AM +0300, Felipe Balbi wrote: > > Hi Greg, > > > > here are the patches I queued for transceiver drivers. Let me know if > > you want me to change anything. > > this will conflict with your usb-next branch, here's the resolution > patch: Thanks for this, that helped out a lot. I also got a conflict in drivers/usb/otg/twl6030-usb.c, which I think I resolved properly, but it would be great if you could verify it. thanks, greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
