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

Browse source

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>

...

This commit is contained in:

David S. Miller 2013-03-27 14:07:55 -04:00

parent 0fb031f036 37287fae7e

commit fe2d2c208d

3 changed files with 23 additions and 5 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

14

drivers/net/ethernet/intel/e1000/e1000_ethtool.c

View file

7

drivers/net/ethernet/intel/e1000e/netdev.c

View file

7

drivers/net/ethernet/intel/ixgb/ixgb_main.c

View file