tree 68dcd86dc8294dfbfa93a9d5a1653c58e6375116
parent b44084c2c822f99dd3f2334b288b7e463d222662
parent d04795d6630d85be7359eb06695f8365d53b2c60
author David S. Miller <davem@davemloft.net> 1381433384 -0400
committer David S. Miller <davem@davemloft.net> 1381433384 -0400

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next

Jeff Kirsher says:

====================
This series contains updates to i40e only.

Alex provides the majority of the patches against i40e, where he does
cleanup of the Tx and RX queues and to align the code with the known
good Tx/Rx queue code in the ixgbe driver.

Anjali provides an i40e patch to update link events to not print to
the log until the device is administratively up.

Catherine provides a patch to update the driver version.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>