Merge branch 'from-linus' into upstream
commit02b311bce9fc87987a123adc3e6a2d0a2caa70e2
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 2 Aug 2006 18:15:39 +0000 (2 14:15 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 2 Aug 2006 18:15:39 +0000 (2 14:15 -0400)
treeba5c42ecf98de1a1a72f4bd5d94dc729ca8196c9
parent8f0f850e240df5bea027caeb1723142c50e37e57
parent49b1e3ea19b1c95c2f012b8331ffb3b169e4c042
Merge branch 'from-linus' into upstream
MAINTAINERS