Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 8 Feb 2012 19:53:43 +0000 (14:53 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 8 Feb 2012 19:53:43 +0000 (14:53 -0500)

Trivial merge