Merge branch 'qlcnic'
authorDavid S. Miller <davem@davemloft.net>
Wed, 24 Apr 2013 23:34:12 +0000 (19:34 -0400)
committerDavid S. Miller <davem@davemloft.net>
Wed, 24 Apr 2013 23:34:12 +0000 (19:34 -0400)
commit204cd4f4957eaaecf0d55cdb329d488348745540
tree30c20974870362439072c2a6ade338d97b1675b6
parent01f27fc085574b301248d4da241e9d5ebd61e5c9
parentf6689d9229cb868fae57a8e453acf14d4ad8fd21
Merge branch 'qlcnic'

Jitendra Kalsaria says:

====================
This set of patches has following updates:
* Enhanced channel configuration logs by adding logs for various cases.
* Take EPORT out of reset before disabling pause frame generation in the
  adapter.
* Add eSwitch statistics support in ethtool stats.
* Enable interrupt coalescing for 83xx adapter.
* Rename IRQ description.
* Added PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_834X and PCI_DEVICE_ID_QLOGIC_824X
  for the patch "qlcnic: Add identifying string for 83xx adapter" as per Francois comment.
====================

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