Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 3 Oct 2013 20:00:03 +0000 (16:00 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 3 Oct 2013 20:00:03 +0000 (16:00 -0400)

Trivial merge