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

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
arch/arm/mach-omap2/board-4430sdp.c between commit
1dbea0f5e23b6c647db72fa4a048cb7140625e13 ("arm: omap4: 4430sdp: drop ehci
support") from the omap tree and commit
181b250cf53233a7a7c6d7e1e9df402506712e93 ("arm: omap: usb: create common
enums and structures for ehci and ohci") from the usb tree.

The former removed the code modified by the latter, so I did that.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature