tree 56dd7ba9fc7f625a2828164eb12a052fd465dbdd
parent 0fb031f036385af1e1de87ac3e98a2afba2139ae
parent 37287fae7e4506fb0822523587c769783164cdd6
author David S. Miller <davem@davemloft.net> 1364407675 -0400
committer David S. Miller <davem@davemloft.net> 1364407675 -0400

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net

Jeff Kirsher says:

====================
This series contains updates to e1000, ixgb and e1000e for Christoph.

Christoph provides 3 patches to resolve missing dma_error_call's to
provided Intel drivers which did not have this fix.
====================

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