]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e5c34a5 291d809)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 24 Dec 2005 20:30:42 +0000 (12:30 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 24 Dec 2005 20:30:42 +0000 (12:30 -0800)

Trivial merge
Linux 2.6 source tree