Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 29 Jun 2012 16:07:37 +0000 (12:07 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 29 Jun 2012 16:07:37 +0000 (12:07 -0400)

Trivial merge