Merge branch 'from-linus' into bcm43xx
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 2 Aug 2006 18:15:21 +0000 (14:15 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 2 Aug 2006 18:15:21 +0000 (14:15 -0400)

Trivial merge