]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6bd0e10 3cfc151)
Merge branch 'upstream-fixes'
authorJeff Garzik <jgarzik@pobox.com>
Tue, 7 Feb 2006 07:06:12 +0000 (02:06 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Tue, 7 Feb 2006 07:06:12 +0000 (02:06 -0500)

Trivial merge
Linux 2.6 source tree