| commit | 30472908d50cf726a68c2b444127a1dafae8a91c | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Thu Jan 17 15:49:59 2008 -0800 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Thu Jan 17 15:49:59 2008 -0800 |
| tree | 6277cdad2fe6949b9c7aa160e1de435fe367f18e | |
| parent | abde3dff2496d9d44a218cf8e2a17c2383f20b22 [diff] | |
| parent | e415e6ea0cd36ece29c7b12232286b5ca097ac96 [diff] |
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.