]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0f3278d 52ab4ac)
Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 4 Nov 2005 18:39:28 +0000 (10:39 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 4 Nov 2005 18:39:28 +0000 (10:39 -0800)

Trivial merge
Linux 2.6 source tree