Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

Browse source

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  [NIU]: Fix 1G PHY link state handling.
  [NET]: Fix TX timeout regression in Intel drivers.

...

This commit is contained in:

Linus Torvalds 2008-01-17 15:49:59 -08:00

parent abde3dff24 e415e6ea0c

commit 30472908d5

4 changed files with 19 additions and 7 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

9

drivers/net/e1000/e1000_main.c

View file

7

drivers/net/e1000e/netdev.c

View file

7

drivers/net/ixgbe/ixgbe_main.c

View file

3

drivers/net/niu.c

View file