]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitc27be9e66f86bc0dd7b699fa5a6b476a31e99cac
tree1d3de97f84082924724c9467be3d362ae3ddc9f7
parent6ab3093db84aff2ceb194d2e1c4bb0ff97461628
parentad0b552fa437e32de22a5071508c3278e5e7acef
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>