Hi Greg,
Today's linux-next merge of the usb tree got a conflict in
drivers/usb/gadget/fsl_mxc_udc.c between commit
4d2f13be1e370a670c1cae20c194d5ce961e0fa5 ("ARM: imx3x: clean up
ARCH_MX3X") from the i.MX tree and commit
a51ea8cc9cfcfd719240455ff8f217b4f165d1d0 ("usb: gadget/fsl_mxc_udc:
Detect the CPU type in run-time") from the usb tree.
The latter is a superset of the former, so I used that.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpsIRtnHKjLB.pgp
Description: PGP signature
