Messages in this thread | | | Date | Mon, 19 Sep 2011 14:41:20 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the net tree with Linus' tree |
| |
Hi all,
Today's linux-next merge of the net tree got a conflict in drivers/net/Kconfig between commit 7756332f5b64 ("pch_gbe: support ML7831 IOH") from Linus' tree and the driver rearrangement patches from the net tree.
The changes in the commit from Linus' tree don;t affect fucntionality, so I just used the net tree version. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |