Merge branch 'from-linus' into upstream
commit69758820a42da207bdc775d6eccf1f9fb67cd62e
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 22 Aug 2006 18:42:36 +0000 (22 14:42 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 22 Aug 2006 18:42:36 +0000 (22 14:42 -0400)
tree4c4dd2b596aa5535231656bf0fa1bc65a8b17471
parent113b898e38cb20e80847c24154ce62273b948c6a
parentef7d1b244fa6c94fb76d5f787b8629df64ea4046
Merge branch 'from-linus' into upstream