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

Trivial merge