Merge branch 'bnxt_en-next'
authorDavid S. Miller <davem@davemloft.net>
Tue, 5 Apr 2016 20:20:49 +0000 (16:20 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 5 Apr 2016 20:20:49 +0000 (16:20 -0400)
commitf1cc8094de7b04dda6f3c5c776f7202dbe6c20ea
treed2a65b1f78704804f7d2a8bd79feff22432004ed
parent04c85bfb4f75d1dd02bc6e82698db701dd5ea8a9
parent29c262fed4067c52977ba279cf71520f9991a050
Merge branch 'bnxt_en-next'

Michael Chan says:

====================
bnxt_en: Updates for net-next.

Update to latest firmware interface, add EEE feature, unsupported SFP+
module warning, and ethtool -s improvements.

v2: Removed the GEEPROM patch and added more comments to the get_eee patch.
====================