]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b7ad6d7 fe0b06b)
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...
authorJeff Garzik <jeff@garzik.org>
Thu, 23 Mar 2006 03:55:57 +0000 (22:55 -0500)
committerJeff Garzik <jeff@garzik.org>
Thu, 23 Mar 2006 03:55:57 +0000 (22:55 -0500)

Trivial merge
Linux 2.6 source tree