tree d1f41c1b26d27eeb837050aebe06c16f8af2400e
parent a20da984fb5ddedb9e8e699c04e10fe0ca609440
parent b9cc977d9d4d1866ee83df38815f4b3b34d99dd9
author David S. Miller <davem@davemloft.net> 1354379410 -0500
committer David S. Miller <davem@davemloft.net> 1354379410 -0500

Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next

Ben Hutchings says:

====================
1. More workarounds for TX queue flush failures that can occur during
   interface reconfiguration.
2. Fix spurious failure of a firmware request running during a system
   clock change, e.g. ntpd started at the same time as driver load.
3. Fix inconsistent statistics after a firmware upgrade.
4. Fix a variable (non-)initialisation in offline self-test that can
   make it more disruptive than intended.
5. Fix a race that can (at least) cause an assertion failure.
6. Miscellaneous cleanup.
====================

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