From: David S. Miller <davem@davemloft.net>
Date: Mon, 10 Aug 2015 21:31:59 +0000 (-0700)
Subject: Merge branch 'bnx2x-fixes'
X-Git-Tag: firefly_0821_release~176^2~1284^2~11
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=875a74b6d6910fc754ec569388f078865f65e088;p=firefly-linux-kernel-4.4.55.git

Merge branch 'bnx2x-fixes'

Yuval Mintz says:

====================
bnx2x: small fixes

This adds 2 small fixes, one to error flows during memory release
and the other to flash writes via ethtool API.
====================

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

875a74b6d6910fc754ec569388f078865f65e088