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

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the net-next tree got a conflict in
drivers/net/ethernet/broadcom/tg3.c between commit 65ec698d1368 ("tg3:
Fix tg3_get_stats64 for 5700 / 5701 devs") from the net tree and various
commits from the net-next tree.

I just used the version from the net-next tree for today (assuming that
this conflict will be fixed shortly).
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature