]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 85d6162 7bdd720)
Merge branch 'upstream-fixes'
authorJeff Garzik <jgarzik@pobox.com>
Wed, 16 Nov 2005 20:12:58 +0000 (15:12 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Wed, 16 Nov 2005 20:12:58 +0000 (15:12 -0500)

Trivial merge
Linux 2.6 source tree