Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 27 May 2011 19:18:35 +0000 (15:18 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 27 May 2011 19:18:35 +0000 (15:18 -0400)

Trivial merge