Messages in this thread | | | Date | Sun, 17 Feb 2013 20:45:35 -0800 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the usb tree with the driver-core tree |
| |
On Mon, Feb 18, 2013 at 03:32:42PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the usb tree got a conflict in > drivers/usb/host/ehci-vt8500.c between commit 148e11349b0c ("usb: Convert > to devm_ioremap_resource()") from the driver-core tree and commit > d57ada0c37ec ("USB: EHCI: make ehci-vt8500 a separate driver") from the > usb tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required).
Looks good to me, thanks.
greg k-h
| |