Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 22 Feb 2011 20:10:22 +0000 (15:10 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 22 Feb 2011 20:10:22 +0000 (15:10 -0500)

Trivial merge