From: David S. Miller <davem@davemloft.net>
Date: Fri, 20 Feb 2015 20:46:55 +0000 (-0500)
Subject: Merge branch 'bnx2x-next'
X-Git-Tag: v4.1-rc1~128^2~416
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=931c471af51565a6290d9fabbe14ed7c8fa4a317;p=linux.git

Merge branch 'bnx2x-next'

Rasesh Mody says:

====================
bnx2-cnic: Driver Version Upgrades

This patch set includes bnx2 and cnic drivers' re-branding changes, fix for a
chip initialization issue and updates the bnx2 driver version to 2.2.6 and
cnic driver version to 2.5.21.

Please apply these patches to net-next.
====================

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

931c471af51565a6290d9fabbe14ed7c8fa4a317