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

From: Stephen Rothwell <[email-masked]>
Date: Tue, 17 May 2011 12:01:04 +1000

Hi all,

Today's linux-next merge of the net tree got a conflict in
drivers/net/vmxnet3/vmxnet3_ethtool.c between commit ebde6f8acba9
("vmxnet3: Fix inconsistent LRO state after initialization") from the
net-current tree and commit a0d2730c9571 ("net: vmxnet3: convert to
hw_features") from the net tree.

I fixed it up (by removing the lines added by the net-current patch) and
can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    [email-masked]