]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
Merge branch 'bnx2x-next'
authorDavid S. Miller <davem@davemloft.net>
Fri, 20 Feb 2015 20:46:55 +0000 (15:46 -0500)
committerDavid S. Miller <davem@davemloft.net>
Fri, 20 Feb 2015 20:46:55 +0000 (15:46 -0500)
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>

Trivial merge