Messages in this thread | | | Date | Mon, 3 Jan 2011 21:29:36 -0800 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the usb tree with the arm tree |
| |
On Tue, Jan 04, 2011 at 04:07:08PM +1100, Stephen Rothwell wrote: > Hi Greg, > > On Tue, 4 Jan 2011 15:58:43 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > > > Today's linux-next merge of the usb tree got a conflict in > > drivers/usb/host/ehci-hcd.c between commit > > 760efe6910d5743084b586d3d0a3b65aea96fb2f ("USB: cns3xxx: Add EHCI and > > OHCI bus glue for cns3xxx SOCs") from the arm tree and various commits > > from the usb tree. > > > > I fixed it up (see below) and can carry the fix as necessary. > > The fix was not quite right (I left out a "#endif") - I fixed that up.
Thanks for doing this, it looks fine.
greg k-h
| |