From: David S. Miller Date: Wed, 24 Apr 2013 23:34:12 +0000 (-0400) Subject: Merge branch 'qlcnic' X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=204cd4f4957eaaecf0d55cdb329d488348745540;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git 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 --- 204cd4f4957eaaecf0d55cdb329d488348745540