From: David S. Miller <davem@davemloft.net>
Date: Thu, 30 May 2013 23:52:47 +0000 (-0700)
Subject: Merge branch 'netxen_nic'
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=cafe89024bd0b1bd088f4c539bcc980cb37c7ce5;hp=90648153754cc1ca2eb08cd19c7b13354a795183;p=deliverable%2Flinux.git

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>
---