Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 19 Jun 2013 19:24:36 +0000 (15:24 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 19 Jun 2013 19:24:36 +0000 (15:24 -0400)

Trivial merge