From: David S. Miller Date: Sun, 6 Dec 2015 00:00:03 +0000 (-0500) Subject: Merge branch 'bnx2x' X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=04f96468f78897099188185efda95fba9f371b7c;p=linux-beck.git 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 --- 04f96468f78897099188185efda95fba9f371b7c