Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 19 Aug 2013 18:24:45 +0000 (14:24 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 19 Aug 2013 18:24:45 +0000 (14:24 -0400)

Trivial merge