Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 27 Jun 2014 17:35:56 +0000 (13:35 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 27 Jun 2014 17:35:56 +0000 (13:35 -0400)

Trivial merge