]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c6329f4 df7addb)
Merge branch 'master'
authorJeff Garzik <jgarzik@pobox.com>
Sat, 24 Dec 2005 14:31:05 +0000 (09:31 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Sat, 24 Dec 2005 14:31:05 +0000 (09:31 -0500)

Trivial merge
Linux 2.6 source tree