Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
John W. Linville [Mon, 6 Jun 2011 17:58:21 +0000 (13:58 -0400)]

Trivial merge