From: David S. Miller <davem@davemloft.net>
Date: Thu, 18 Apr 2013 18:55:07 +0000 (-0400)
Subject: Merge branch 'qlogic'
X-Git-Tag: MMI-PSA29.97-13-9~14628^2~16
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d5f2cffc49ae27aff52eeda6206acb5db54693c9;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'qlogic'

Shahed Shaikh says:

====================
This patch series contains bug fixes for -
* Loopback test failure while traffic is running.
* Tx timeout and subsequent firmware reset by removing check for
  '(adapter->netdev->features & (NETIF_F_TSO | NETIF_F_TSO6)' from tx fast
  path, as per Eric's suggestion.
* Typo in logs.
====================

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

d5f2cffc49ae27aff52eeda6206acb5db54693c9