Merge branch 'bnx2x'
authorDavid S. Miller <davem@davemloft.net>
Wed, 1 May 2013 19:07:50 +0000 (15:07 -0400)
committerDavid S. Miller <davem@davemloft.net>
Wed, 1 May 2013 19:07:50 +0000 (15:07 -0400)
Yuval Mintz says:

====================
This fixes 2 small bugs - one which may cause an unnecessary link flap,
and the other is a small memory leak when unloading while cnic is not
loaded.
====================

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

Trivial merge