projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 04c85bf 29c262f)
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)
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.
====================


Trivial merge