summaryrefslogtreecommitdiff
path: root/drivers/pci
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-02-20 20:46:55 (GMT)
committerDavid S. Miller <davem@davemloft.net>2015-02-20 20:46:55 (GMT)
commit931c471af51565a6290d9fabbe14ed7c8fa4a317 (patch)
tree8adff655442ccf25229cc7c4098b9700356d7de2 /drivers/pci
parent959d10f6bbf6ab5b8813c4e37540a2e43ca2ae96 (diff)
parent85fe7cd21f99fed1842275ef86c88de5ecc998b4 (diff)
downloadlinux-931c471af51565a6290d9fabbe14ed7c8fa4a317.tar.xz
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>
Diffstat (limited to 'drivers/pci')
0 files changed, 0 insertions, 0 deletions