]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 09e590e ef7d1b2)
Merge branch 'master' into upstream-fixes
authorJeff Garzik <jeff@garzik.org>
Sat, 19 Aug 2006 21:25:34 +0000 (17:25 -0400)
committerJeff Garzik <jeff@garzik.org>
Sat, 19 Aug 2006 21:25:34 +0000 (17:25 -0400)

Trivial merge
Linux 2.6 source tree