Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 17 Jan 2008 23:49:59 +0000 (15:49 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 17 Jan 2008 23:49:59 +0000 (15:49 -0800)
commit30472908d50cf726a68c2b444127a1dafae8a91c
tree6277cdad2fe6949b9c7aa160e1de435fe367f18e
parentabde3dff2496d9d44a218cf8e2a17c2383f20b22
parente415e6ea0cd36ece29c7b12232286b5ca097ac96
Merge git://git./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.