Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 22 Jun 2012 18:36:10 +0000 (14:36 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 22 Jun 2012 18:36:10 +0000 (14:36 -0400)

Trivial merge