Merge branch 'qlcnic'

Browse source

Manish Chopra says:

====================
qlcnic: Bug fixes.

This patch series contains following bug fixes:

* Fixes related to ethtool statistics.
* Fix for flash read related API.

Please apply this series to 'net'.
====================

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

...

This commit is contained in:

David S. Miller 2014-09-26 15:11:37 -04:00

parent d61746b2e7 3456399b03

commit 2b07f0d2f6

2 changed files with 7 additions and 8 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

5

drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c

View file

10

drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c

View file