Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
John W. Linville [Mon, 12 Dec 2011 19:19:43 +0000 (14:19 -0500)]

Trivial merge