]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f587fb7 4541a5d)
Merge branch 'upstream-fixes' into upstream
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 26 May 2006 20:12:24 +0000 (16:12 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 26 May 2006 20:12:24 +0000 (16:12 -0400)

Trivial merge
Linux 2.6 source tree