Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 27 Feb 2014 20:05:51 +0000 (15:05 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 27 Feb 2014 20:05:51 +0000 (15:05 -0500)

Trivial merge