]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3be4bb0 8b200ab)
Merge branch 'upstream-fixes'
authorJeff Garzik <jgarzik@pobox.com>
Thu, 17 Nov 2005 01:45:51 +0000 (20:45 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Thu, 17 Nov 2005 01:45:51 +0000 (20:45 -0500)

Trivial merge
Linux 2.6 source tree