]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 987024c 2e84abe)
Merge branch 'upstream-fixes' into upstream
authorJeff Garzik <jeff@garzik.org>
Thu, 8 Jun 2006 19:46:38 +0000 (15:46 -0400)
committerJeff Garzik <jeff@garzik.org>
Thu, 8 Jun 2006 19:46:38 +0000 (15:46 -0400)

Trivial merge
Linux 2.6 source tree