Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 10 Apr 2014 13:58:06 +0000 (09:58 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 10 Apr 2014 13:58:06 +0000 (09:58 -0400)

Trivial merge