projects
/
kernel
/
kernel-generic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
abde3df
e415e6e
)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
author
Linus Torvalds
<torvalds@woody.linux-foundation.org>
Thu, 17 Jan 2008 23:49:59 +0000
(15:49 -0800)
committer
Linus Torvalds
<torvalds@woody.linux-foundation.org>
Thu, 17 Jan 2008 23:49:59 +0000
(15:49 -0800)
* 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.
Trivial merge