Messages in this thread | | | Date | Fri, 4 Mar 2011 12:31:35 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the net tree with the i.MX tree |
| |
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@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |