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

[Stephen Rothwell]

Hi Paul,

Today's linux-next merge of the moduleh tree got a conflict in
drivers/usb/dwc3/dwc3-omap.c between commit 45b3cd4ad79b ("usb: dwc3:
omap: convert pdata to of property") from the usb tree and commit
13ae246db4a0 ("includecheck: delete any duplicate instances of module.h")
from the moduleh tree.

Just context changes.  I fixed it up and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature