From: David S. Miller <davem@davemloft.net>
Date: Thu, 30 May 2013 23:52:47 +0000 (-0700)
Subject: Merge branch 'netxen_nic'
X-Git-Tag: v3.11-rc1~16^2~266
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cafe89024bd0b1bd088f4c539bcc980cb37c7ce5;p=platform%2Fkernel%2Flinux-stable.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>
---

cafe89024bd0b1bd088f4c539bcc980cb37c7ce5