Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 25 Jul 2013 20:48:01 +0000 (16:48 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 25 Jul 2013 20:48:01 +0000 (16:48 -0400)

Trivial merge