]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0cc349d d1b46b0)
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
authorJeff Garzik <jgarzik@pobox.com>
Sat, 28 Jan 2006 21:07:32 +0000 (16:07 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Sat, 28 Jan 2006 21:07:32 +0000 (16:07 -0500)

Trivial merge
Linux 2.6 source tree