On Fri, Jan 07, 2011 at 01:22:40PM -0800, Linus Torvalds wrote: > On Thu, Jan 6, 2011 at 3:50 PM, Greg KH <gregkh@xxxxxxx> wrote: > > > > Nothing radical here at all, lots of musb changes, which touched a bunch > > of arch-specific code, and some new drivers, mostly gadget ones. > > There were also a number of conflicts with the ARM updates (omap clock > data in particular - added aliases, changed names, you name it). > > I spent some time trying to fix it up properly, and maybe I even > succeeded, but you guys should really look the result over. The drivers/usb/* changes look good to me. I know Tony was looking at the omap merge issues, and if there was one, I think he had the needed fixup. thanks for doing the merge. 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