Skip to content
Commit 30472908 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 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.
parents abde3dff e415e6ea
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment