Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 27 Sep 2013 17:09:17 +0000 (13:09 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 27 Sep 2013 17:11:17 +0000 (13:11 -0400)
Also fixed-up a badly indented closing brace...

Signed-off-by: John W. Linville <linville@tuxdriver.com>

Trivial merge