tree a0d8838ee5d45bb1d8593b88e26778ad9ec62c99
parent 6c7e7610ff6888ea15a901fbcb30c5d461816b34
parent 31ac910e105db07e2f615d00cf20876b27538d52
author David S. Miller <davem@davemloft.net> 1390012693 -0800
committer David S. Miller <davem@davemloft.net> 1390012693 -0800

Merge branch 'ixgbe'

Aaron Brown says:

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

This series contains updates to ixgbe Ethan Zhao.  The first one replaces
the magic number "63" with a macro, IXGBE_MAX_VFS_DRV_LIMIT, the second
moves the call to set driver_max_VFS to before SRIOV is enabled.

The code of these patches match the v3 (1/2) and v2 (2/2) versions sent
to the e1000-devel and netdev mailing lists.  The intermediate versions
(v4, v5) are from sorting out style issues, mostly tabs to spaces and
split lines probably introduced via mailer.
====================

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