Merge branch 'master' of ssh://ra.kernel.org/pub/scm/linux/kernel/git/linville/wirele...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 9 Nov 2011 18:41:11 +0000 (13:41 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 9 Nov 2011 18:41:11 +0000 (13:41 -0500)

Trivial merge