]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit1342a432ef48ae5b599164693677ba8c623801d5
tree6277cdad2fe6949b9c7aa160e1de435fe367f18e
parentb73e483320a58483b40191c6babf8d4ba82d9582
parent68bbdc9b707dba19d101db6cf0654ce103ae4507
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.