From: David S. Miller Date: Wed, 1 May 2013 19:07:50 +0000 (-0400) Subject: Merge branch 'bnx2x' X-Git-Tag: firefly_0821_release~3680^2~614^2~2 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c3b28ea36946a22469a5519977a3b79428ded4af;p=firefly-linux-kernel-4.4.55.git 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 --- c3b28ea36946a22469a5519977a3b79428ded4af