Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 24 May 2011 20:47:54 +0000 (16:47 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 24 May 2011 20:47:54 +0000 (16:47 -0400)

Trivial merge