Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 18 Jun 2013 18:04:51 +0000 (14:04 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 18 Jun 2013 18:04:51 +0000 (14:04 -0400)

Trivial merge