]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 51e9f2f cac0e8e)
Merge branch 'upstream-fixes'
authorJeff Garzik <jgarzik@pobox.com>
Thu, 9 Feb 2006 09:29:00 +0000 (04:29 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Thu, 9 Feb 2006 09:29:00 +0000 (04:29 -0500)

Trivial merge
Linux 2.6 source tree