Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 7 Oct 2014 18:48:29 +0000 (14:48 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 7 Oct 2014 18:48:29 +0000 (14:48 -0400)

Trivial merge