Re: [GIT PULL] usb: musb: patches for v3.8 merge window

2012-11-11 Thread Greg KH
On Fri, Nov 09, 2012 at 11:27:32PM +0200, Felipe Balbi wrote: > Hi Greg, > > MUSB changes for v3.8 follow. This will conflict with your usb-next branch, > below you can find the resolution I used: > > diff --cc drivers/usb/musb/musb_dsps.c > index ff5f112,e770f79..cf08966a > --- a/drivers/usb/mus

[GIT PULL] usb: musb: patches for v3.8 merge window

2012-11-09 Thread Felipe Balbi
Hi Greg, MUSB changes for v3.8 follow. This will conflict with your usb-next branch, below you can find the resolution I used: diff --cc drivers/usb/musb/musb_dsps.c index ff5f112,e770f79..cf08966a --- a/drivers/usb/musb/musb_dsps.c +++ b/drivers/usb/musb/musb_dsps.c @@@ -458,14 -489,24 +489,24 @