linux-next: manual merge of the usb tree with the usb.current tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/host/Kconfig between commit cd6e245a2d06 ("usb: Remove
references to non-existent PLAT_S5P symbol") from the usb.current tree
and commit dd3cf17488b1 ("usb: host: Remove optional dependencies on
PLAT_S5P") from the usb tree.

I fixed it up (I used the usb tree version) and can carry the fix as
necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgpuJ_jYgVSWn.pgp
Description: OpenPGP digital signature