Merge branch 'from-linus' into upstream
commit623b3e1d645e42030897d18d37db10133d763006
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 11 Sep 2006 18:08:41 +0000 (11 14:08 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 11 Sep 2006 18:08:41 +0000 (11 14:08 -0400)
tree090ff481cd72b47ff87d50615461712a33ba41e6
parentc576af479162c0a11d4e2691ebc97354958d9285
parent38f5745c5a90641079fd5b48600ae63f7ab6edcd
Merge branch 'from-linus' into upstream
MAINTAINERS