From: David S. Miller Date: Fri, 24 Aug 2012 20:35:43 +0000 (-0400) Subject: Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc... X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=255e87657a84e21986e5d9070f3dee4aa8d1d531;p=deliverable%2Flinux.git 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 --- 255e87657a84e21986e5d9070f3dee4aa8d1d531