Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
John W. Linville [Fri, 8 Jul 2011 15:01:31 +0000 (11:01 -0400)]

Trivial merge