]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1e279dd 99ad25a)
Merge master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 13 Jul 2005 22:48:33 +0000 (15:48 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 13 Jul 2005 22:48:33 +0000 (15:48 -0700)

Trivial merge
Linux 2.6 source tree