Messages in this thread | | | Date | Tue, 3 Jul 2012 16:03:04 -0700 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the usb tree with the mfd tree |
| |
On Tue, Jul 03, 2012 at 02:09:38PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the usb tree got a conflict in > drivers/usb/host/ehci-omap.c between commit 996439f8fa07 ("mfd: USB: Fix > the omap-usb EHCI ULPI PHY reset fix issues") from the mfd tree and > commit 984e97483a14 ("ARM: OMAP: USB: Fixup ehci_hcd_omap_probe error > path") from the usb tree. > > I fixed it up (see below) and can carry the fix as necessary.
Looks good to me, thanks.
greg k-h
| |