linux-next: manual merge of the net-next tree with Linus' tree
From: Stephen Rothwell
Date: Wed Jul 18 2012 - 21:15:18 EST
Today's linux-next merge of the net-next tree got a conflict in
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c between commit
936597631dd3 ("ixgbevf: Prevent RX/TX statistics getting reset to zero")
from Linus' tree and various commits from the net-next tree.
I just used the version from the net tree.
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Description: PGP signature