]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6ed1425 df8ccb9)
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
authorJeff Garzik <jeff@garzik.org>
Wed, 24 May 2006 04:29:57 +0000 (00:29 -0400)
committerJeff Garzik <jeff@garzik.org>
Wed, 24 May 2006 04:29:57 +0000 (00:29 -0400)

Trivial merge
Linux 2.6 source tree