Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 4 Jan 2012 16:37:30 +0000 (11:37 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 4 Jan 2012 16:37:30 +0000 (11:37 -0500)

Trivial merge