Merge branch 'netxen'
authorDavid S. Miller <davem@davemloft.net>
Tue, 30 Sep 2014 20:22:51 +0000 (16:22 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 30 Sep 2014 20:22:51 +0000 (16:22 -0400)
commit37b9a2673cd24e389216770be24a064b6200a822
tree23f47d40a2a16b4228ba7e10818b0d82ca78d169
parent705f1c869d577c8055736dd02501f26a2507dd5b
parent9295f940fb677b343980cd67f3c91a4eb48d2fae
Merge branch 'netxen'

Manish Chopra says:

====================
netxen: Bug fixes.

This series fixes some TX specific issues.
* Move spin_lock(tx_clean_lock) in down path to fix
  atomic sleep bug (Reported by Mike Galbraith).
* Fix hang in interface down while running traffic.

Please consider applying this to 'net'.
====================

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