On Thu, Dec 22, 2011 at 02:06:27PM -0800, Greg KH wrote: > On Wed, Dec 21, 2011 at 02:05:13PM +0200, Felipe Balbi wrote: > > Hi Greg, > > > > A few more changes for the Gadget framework for 3.3 merge window. > > > > We are adding the Scatter/Gather support to gadget framework and > > the first controller to use it is the DWC3 driver. > > > > You will find a conflict when merging this branch. Here's the fix: > > > > diff --cc drivers/usb/gadget/Kconfig > > No, I had a merge problem in drivers/usb/gadget/mv_udc_core.c, which I > fixed up by hand and pushed out. Can you verify I got it correct? It looks correct. Happy xmas ;-) -- balbi
Attachment:
signature.asc
Description: Digital signature
