summaryrefslogtreecommitdiffstats
path: root/net/core
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-02-24 18:44:05 -0500
committerDavid S. Miller <davem@davemloft.net>2014-02-24 18:44:05 -0500
commit8bfdfbc188ff46f7495ae05a2bc366943b83393f (patch)
tree1d3de97f84082924724c9467be3d362ae3ddc9f7 /net/core
parenta1991c749a7bfacb766a056aff11864216670dd6 (diff)
parente6b0b019795c50c9e6cef4e2b3ccabfc12d7ea18 (diff)
downloadlinux-8bfdfbc188ff46f7495ae05a2bc366943b83393f.tar.bz2
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>
Diffstat (limited to 'net/core')
0 files changed, 0 insertions, 0 deletions