]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'from-linus' into upstream
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 5 May 2006 20:50:23 +0000 (16:50 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 5 May 2006 20:50:23 +0000 (16:50 -0400)

Trivial merge