Merge branch 'qlogic'
authorDavid S. Miller <davem@davemloft.net>
Thu, 18 Apr 2013 18:55:07 +0000 (14:55 -0400)
committerDavid S. Miller <davem@davemloft.net>
Thu, 18 Apr 2013 18:55:07 +0000 (14:55 -0400)
commitd5f2cffc49ae27aff52eeda6206acb5db54693c9
tree4e9ea7b33bc2001b26293057f38b811fde87c487
parent026ac677414c62550269d53907ea47412ec2bd81
parent7bc27a8cd4db2e6ed71d29b5ceae5b4ee873c9af
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>