Re: linux-next: manual merge of the usb tree with the mfd tree

2012-07-10 Thread Alan Stern
On Tue, 10 Jul 2012, 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 2761a6394516 ("mfd: USB: Fix > the omap-usb EHCI ULPI PHY reset fix issues") from the mfd tree and > commit 1a49e2ac9651 ("EHCI: cen

linux-next: manual merge of the usb tree with the mfd tree

2012-07-09 Thread Stephen Rothwell
Hi Greg, Today's linux-next merge of the usb tree got a conflict in drivers/usb/host/ehci-omap.c between commit 2761a6394516 ("mfd: USB: Fix the omap-usb EHCI ULPI PHY reset fix issues") from the mfd tree and commit 1a49e2ac9651 ("EHCI: centralize controller initialization") from the usb tree. I