]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bdad69b 387e2b0)
Merge branch 'master' into upstream
authorJeff Garzik <jeff@garzik.org>
Wed, 24 May 2006 04:27:05 +0000 (00:27 -0400)
committerJeff Garzik <jeff@garzik.org>
Wed, 24 May 2006 04:27:05 +0000 (00:27 -0400)

Trivial merge
Linux 2.6 source tree