Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc...
authorDavid S. Miller <davem@davemloft.net>
Fri, 24 Aug 2012 20:35:43 +0000 (16:35 -0400)
committerDavid S. Miller <davem@davemloft.net>
Fri, 24 Aug 2012 20:35:43 +0000 (16:35 -0400)
commit255e87657a84e21986e5d9070f3dee4aa8d1d531
treec20e26ce24779333d927fa4b172deb2d9df59ebf
parent85c21049fc588e0a51b443fe2bad348d18f4992c
parent8f8b3d518999fd1c342310910aa1e49112c86d05
Merge branch 'for-davem' of git://git./linux/kernel/git/bwh/sfc-next

Ben Hutchings says:

====================
1. Change the TX path to stop queues earlier and avoid returning
NETDEV_TX_BUSY.
2. Remove some inefficiencies in soft-TSO.
3. Fix various bugs involving device state transitions and/or reset
scheduling by error handlers.
4. Take advantage of my previous change to operstate initialisation.
5. Miscellaneous cleanup.
====================

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