Merge branch 'qlcnic-next'
authorDavid S. Miller <davem@davemloft.net>
Mon, 24 Feb 2014 23:44:05 +0000 (18:44 -0500)
committerDavid S. Miller <davem@davemloft.net>
Mon, 24 Feb 2014 23:44:05 +0000 (18:44 -0500)
commit8bfdfbc188ff46f7495ae05a2bc366943b83393f
tree1d3de97f84082924724c9467be3d362ae3ddc9f7
parenta1991c749a7bfacb766a056aff11864216670dd6
parente6b0b019795c50c9e6cef4e2b3ccabfc12d7ea18
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>