]> git.baikalelectronics.ru Git - kernel.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)
commit956c1b5a1cf759fd63bd70c717e3f58da9165783
tree06c382231dea71a60081b253087e998db608ea02
parent0f1a1fb4401a64edba19daf8a24e82a9356c8a70
parentd63529a8288de89170358ad7dba4fbd3da242052
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>