]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 03a49ee 22d4d77)
Merge branch 'upstream'
authorJeff Garzik <jgarzik@pobox.com>
Wed, 18 Jan 2006 00:29:28 +0000 (19:29 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Wed, 18 Jan 2006 00:29:28 +0000 (19:29 -0500)

Trivial merge
Linux 2.6 source tree