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

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/epl/VirtualEthernetLinux.c between commit
6ed106549d17474ca17a16057f4c0ed4eba5a7ca ("net: use NETDEV_TX_OK instead
of 0 in ndo_start_xmit() functions") from the net tree and commit
49acb975a21d150c4beba4e581f3e1d004dd2867 ("Staging: remove epl driver")
from the staging tree.

The latter just removes the file, so I did that.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature