]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 612eff0 d588fcb)
Merge branch 'master' into upstream
authorJeff Garzik <jeff@garzik.org>
Fri, 23 Jun 2006 02:51:46 +0000 (22:51 -0400)
committerJeff Garzik <jeff@garzik.org>
Fri, 23 Jun 2006 02:51:46 +0000 (22:51 -0400)

Trivial merge
Linux 2.6 source tree