]> err.no Git - linux-2.6/commitdiff
Merge branch 'from-jgarzik-upstream'
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 28 Feb 2006 01:12:42 +0000 (20:12 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 28 Feb 2006 01:12:42 +0000 (20:12 -0500)

Trivial merge