tree 56b149cd0d9a8ae957f1fb8ddfa800dde1aeec07
parent ebb0531ba22042db78348906b7b39d194d5d927f
parent 41457f64da53112996d2ac607fbb2681e71a9e97
author David S. Miller <davem@davemloft.net> 1400876898 -0400
committer David S. Miller <davem@davemloft.net> 1400876898 -0400

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

Jeff Kirsher says:

====================
Intel Wired LAN Driver Updates

This series contains updates to igb, igbvf, ixgbe, i40e and i40evf.

Jacob provides eight patches to cleanup the ixgbe driver to resolve various
checkpatch.pl warnings/errors as well as minor coding style issues.

Stephen Hemminger and I provide simple cleanups of void functions which
had useless return statements at the end of the function which are not
needed.

v2: Dropped Emil's patch "ixgbe: fix the detection of SFP+ capable interfaces"
    while I wait for his updated patch to be validated.
====================

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