Merge branch 'qlcnic'
authorDavid S. Miller <davem@davemloft.net>
Sun, 1 Sep 2013 02:35:26 +0000 (22:35 -0400)
committerDavid S. Miller <davem@davemloft.net>
Sun, 1 Sep 2013 02:35:26 +0000 (22:35 -0400)
commitba39767288661c01ac7797b6b981f73b6513cf55
tree411bae7d6a3df6d43777ae26f0c35caded95923c
parenteb3c0d83cc78361a28e52e514a7095fdbf771e7e
parent693dcd2fb23a19b29ebff786b3283cc7eeb60edb
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>