Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 9 Jan 2014 15:19:01 +0000 (10:19 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 9 Jan 2014 15:19:01 +0000 (10:19 -0500)

Trivial merge