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/musb/ux500.c between commit 9a65d162e449 ("usb: musb: ux500:
fix 'musbid' undeclared error in ux500_remove()") from the usb.current
tree and commit 2f7711642559 ("usb: musb: remove hand-crafted id
handling") from the usb tree.

The latter supercedes the former so I used that and can carry the fix as
necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature