Merge branch 'bnx2x-fixes'
authorDavid S. Miller <davem@davemloft.net>
Mon, 10 Aug 2015 21:31:59 +0000 (14:31 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 10 Aug 2015 21:31:59 +0000 (14:31 -0700)
commit875a74b6d6910fc754ec569388f078865f65e088
treed978ba9920978f13282a832ba7a134a6605f2a10
parent21a447637d28eb824a1163c1fc5f41ffa4b28e33
parent0ea853dfa93371e651d8b7b27fd2344e973a86ed
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>