* linux-next: manual merge of the net tree with the i.MX tree
@ 2011-03-04 1:31 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2011-03-04 1:31 UTC (permalink / raw)
To: David Miller, netdev
Cc: linux-next, linux-kernel, Richard Zhao, Sascha Hauer,
"Uwe Kleine-König"
[-- Attachment #1: Type: text/plain, Size: 508 bytes --]
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/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-03-04 1:31 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-04 1:31 linux-next: manual merge of the net tree with the i.MX tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox