]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3fd1bb9 d4ef160)
Merge HEAD from master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 26 Aug 2005 23:32:31 +0000 (16:32 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 26 Aug 2005 23:32:31 +0000 (16:32 -0700)

Trivial merge
Linux 2.6 source tree