]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9273214 2ad4106)
Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 27 Oct 2005 23:58:20 +0000 (16:58 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 27 Oct 2005 23:58:20 +0000 (16:58 -0700)

Trivial merge
Linux 2.6 source tree