]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5d25ea7 353b28b)
Merge branch 'from-linus' into upstream
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 22 May 2006 18:26:25 +0000 (14:26 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 22 May 2006 18:26:25 +0000 (14:26 -0400)

Trivial merge
Linux 2.6 source tree