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

Trivial merge