]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 225bc8f 2f9616d)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/nf-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 12 Dec 2005 23:49:56 +0000 (15:49 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 12 Dec 2005 23:49:56 +0000 (15:49 -0800)

Trivial merge
Linux 2.6 source tree