Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 2 Jun 2014 15:20:17 +0000 (11:20 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 2 Jun 2014 15:20:17 +0000 (11:20 -0400)

Trivial merge