Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 22 May 2012 19:18:06 +0000 (15:18 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 22 May 2012 19:18:06 +0000 (15:18 -0400)

Trivial merge