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

Trivial merge