linux-next: manual merge of the kbuild tree with the tree

[Stephen Rothwell]

Hi Michal,

Today's linux-next merge of the kbuild tree got a conflict in
drivers/net/ethernet/stmicro/stmmac/Kconfig (drivers/net/stmmac/Kconfig
in the kbuild tree) between commit 7ac6653a085b ("stmmac: Move the
STMicroelectronics driver") from the  tree and commit 2d3def0b73e3
("stmmac: drop unused Kconfig symbol") from the kbuild tree.

I just used the latter version.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature