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)
commitc3b28ea36946a22469a5519977a3b79428ded4af
treee18c333202d64be1f0a551ac26f834bed0f923d0
parentbe3e45810bb1ee0bdfa93f6b9532d8c451e50f48
parent05952246cdbf62da797323e7ce156be2e24b4d8c
Merge branch 'bnx2x'

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>