]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: febf7ea 6073aa6)
Merge branch 'master'
authorSam Ravnborg <sam@mars.ravnborg.org>
Tue, 3 Jan 2006 14:59:28 +0000 (15:59 +0100)
committerSam Ravnborg <sam@mars.ravnborg.org>
Tue, 3 Jan 2006 14:59:28 +0000 (15:59 +0100)

Trivial merge
Linux 2.6 source tree