From: David S. Miller <davem@davemloft.net>
Date: Mon, 24 Feb 2014 23:44:05 +0000 (-0500)
Subject: Merge branch 'qlcnic-next'
X-Git-Tag: firefly_0821_release~176^2~4167^2~282
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8bfdfbc188ff46f7495ae05a2bc366943b83393f;p=firefly-linux-kernel-4.4.55.git

Merge branch 'qlcnic-next'

Shahed Shaikh says:

====================
qlcnic: Re-factoring and enhancements

This patch series includes following changes -
* Re-factored firmware minidump template header handling
* Support to make 8 vNIC mode application to work with 16 vNIC mode
* Enhance error message logging when adapter is in failed state and
  when adapter lock access fails.
* Allow vlan0 traffic
* update MAINTAINERS

Please apply this series to net-next.
====================

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

8bfdfbc188ff46f7495ae05a2bc366943b83393f