]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge branch 'netxen_nic'
authorDavid S. Miller <davem@davemloft.net>
Thu, 30 May 2013 23:52:47 +0000 (16:52 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 30 May 2013 23:52:47 +0000 (16:52 -0700)
commitcafe89024bd0b1bd088f4c539bcc980cb37c7ce5
tree06c382231dea71a60081b253087e998db608ea02
parenta230e033845853ebcfd21aae7a019a5392ebd30e
parent90648153754cc1ca2eb08cd19c7b13354a795183
Merge branch 'netxen_nic'

Manish Chopra says:

====================
This patch series includes following changes:

* Log driver version information with firmware version information.
* Log "Unknown" adapter name and serial number in case of
  mismatched adapter type.
* netxen_setup_intr() function code cleanup and changes to avoid attaching
  of multiple pci functions on an adapter with mixed interrupts mode
  [MSI-X/MSI + INTx].
====================

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