tree 055ff5d64bf6a601eb5165c0820fcb18db998121
parent a35165ca101695aa2cc5a6300ef69ae60be39a49
parent 4a0c081eff43a11c65dee3ad6c457f7f58bcebe0
author David S. Miller <davem@davemloft.net> 1411425533 -0400
committer David S. Miller <davem@davemloft.net> 1411425533 -0400

Merge branch 'bcmgenet'

Florian Fainelli says:

====================
net: bcmgenet: TX reclaim and DMA fixes

This patch set contains one fix for an accounting problem while reclaiming
transmitted buffers having fragments, and the second fix is to make sure
that the DMA shutdown is properly controlled.
====================

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