Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
John W. Linville [Wed, 12 Jun 2013 14:57:04 +0000 (10:57 -0400)]

Trivial merge