Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/wireless-2.6
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 25 Jun 2008 19:17:58 +0000 (15:17 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 25 Jun 2008 19:17:58 +0000 (15:17 -0400)

Trivial merge