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

[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 am not sure how to fix this up, I have just effectively reverted the
effect of the former commit on this file.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature