From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Thu, 17 Jan 2008 23:49:59 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v3.12-rc1~24183
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=30472908d50cf726a68c2b444127a1dafae8a91c;p=kernel%2Fkernel-generic.git

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.
---

30472908d50cf726a68c2b444127a1dafae8a91c