Merge branch 'from-linus' into upstream
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 29 Aug 2006 20:17:25 +0000 (16:17 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 29 Aug 2006 20:17:25 +0000 (16:17 -0400)
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge