projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b618aaa 44c33c6)
Merge branch 'bnx2x'
authorDavid S. Miller <davem@davemloft.net>
Sun, 6 Dec 2015 00:00:03 +0000 (19:00 -0500)
committerDavid S. Miller <davem@davemloft.net>
Sun, 6 Dec 2015 00:00:03 +0000 (19:00 -0500)
commit04f96468f78897099188185efda95fba9f371b7c
treebc6221bc1d98708f8c6f7ad387d8077c91a761f7tree | snapshot (tar.gz zip)
parentb618aaa91b5870e7bd139987ac4b7bf0851142d0commit | diff
parent44c33c66310c76979649b7c0004af7744bd4ce7acommit | diff
Merge branch 'bnx2x'

Michal Schmidt says:

====================
bnx2x: fewer error messages, simplification

This removes one redundant error message in bnx2x and changes another one to
WARN_ONCE. The third patch is a small simplification in ethtool stats.
====================

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