Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 30 Nov 2011 19:14:42 +0000 (14:14 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 30 Nov 2011 19:14:42 +0000 (14:14 -0500)

Trivial merge