Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net
authorDavid S. Miller <davem@davemloft.net>
Wed, 27 Mar 2013 18:07:55 +0000 (14:07 -0400)
committerDavid S. Miller <davem@davemloft.net>
Wed, 27 Mar 2013 18:07:55 +0000 (14:07 -0400)
commitfe2d2c208d3cdde37852bdc2f82788134d99de85
tree56dd7ba9fc7f625a2828164eb12a052fd465dbdd
parent0fb031f036385af1e1de87ac3e98a2afba2139ae
parent37287fae7e4506fb0822523587c769783164cdd6
Merge branch 'master' of git://git./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>