From: David S. Miller <davem@davemloft.net>
Date: Sun, 1 Sep 2013 02:35:26 +0000 (-0400)
Subject: Merge branch 'qlcnic'
X-Git-Tag: v3.12-rc1~132^2~92
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ba39767288661c01ac7797b6b981f73b6513cf55;p=pandora-kernel.git

Merge branch 'qlcnic'

Shahed Shaikh says:

====================
This patch series contains -
* Enhanced PVID handling for 84xx adapters by
  not indicating PVID configuration to VF driver and
  keeping VF driver in no VLAN configuration mode becasue
  adapter supports VLAN stripping.
* Removed inappropriate usage of inline keyword.
* Enhanced minidump feature by using firmware recommended
  dump capture mask and using CAMRAM register to store
  firmware dump state.
* AER handling support for 83xx adapter.
* Added support for per port eswitch configuration.
====================

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

ba39767288661c01ac7797b6b981f73b6513cf55
Reading git-diff-tree failed