Merge branch 'sfc-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc
authorDavid S. Miller <[email protected]>
Tue, 26 Feb 2013 22:21:58 +0000 (17:21 -0500)
committerDavid S. Miller <[email protected]>
Tue, 26 Feb 2013 22:21:58 +0000 (17:21 -0500)
Ben Hutchings says:

====================
Some fixes that should go into 3.9:

1. Fix packet corruption when using non-coherent RX DMA buffers.
2. Fix occasional watchdog misfiring when changing MTU or ring size.

These are longstanding bugs and should be fixed in stable as well, but
I'd like to review other recent fixes first and send a separate request
for stable inclusion.
====================

Signed-off-by: David S. Miller <[email protected]>

Trivial merge