Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 21 Nov 2013 15:26:17 +0000 (10:26 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 21 Nov 2013 15:26:17 +0000 (10:26 -0500)

Trivial merge