Merge branch 'from-linus' into upstream
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 26 May 2006 20:06:58 +0000 (16:06 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 26 May 2006 20:06:58 +0000 (16:06 -0400)
commitf587fb74b26a10354f1eb73e8d054cd15e5a2fe2
treea453a270fc86ada85d808487c911387739ce2296
parentdf8ccb9bf1ca360581a94c2245efb9fa613fbb29
parent705af309505681f197f81618440954d10f120dc0
Merge branch 'from-linus' into upstream