]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1a2e8a6 330ab71)
Merge branch 'master' into upstream
authorJeff Garzik <jeff@garzik.org>
Tue, 2 May 2006 18:33:57 +0000 (14:33 -0400)
committerJeff Garzik <jeff@garzik.org>
Tue, 2 May 2006 18:33:57 +0000 (14:33 -0400)

Trivial merge
Linux 2.6 source tree