git.samba.org / sfrench / cifs-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 959d10f 85fe7cd)
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)
commit931c471af51565a6290d9fabbe14ed7c8fa4a317
tree8adff655442ccf25229cc7c4098b9700356d7de2tree
parent959d10f6bbf6ab5b8813c4e37540a2e43ca2ae96commit | diff
parent85fe7cd21f99fed1842275ef86c88de5ecc998b4commit | diff
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>
Unnamed repository; edit this file 'description' to name the repository.