linux-next: manual merge of the net tree with Linus' tree

[Stephen Rothwell]

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@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature