Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem

Also fixed-up a badly indented closing brace...
Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>