linux-next: manual merge of the net tree with the i.MX tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the net tree got a conflict in
drivers/net/Kconfig between commit
4d2f13be1e370a670c1cae20c194d5ce961e0fa5 ("ARM: imx3x: clean up
ARCH_MX3X") from the i.MX tree and commit
085e79ed88351d2f3cbf257ff4fc00394792da18 (net/fec: consolidate all i.MX
options to CONFIG_ARM"") from the net tree.

The latter seems to be a superset of the former, so I used that.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature