Messages in this thread | | | Date | Tue, 25 Jun 2013 08:18:07 -0700 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the usb tree with the devicetree tree |
| |
On Tue, Jun 25, 2013 at 04:53:10PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the usb tree got a conflict in > drivers/usb/chipidea/Makefile between commit 8973ba8b325f ("usb: > chipidea: depend on CONFIG_OF instead of CONFIG_OF_DEVICE") from the > devicetree tree and commit 8e22978c5708 ("usb: chipidea: drop "13xxx" > infix") 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
| |