Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 1 Feb 2012 15:48:50 +0000 (10:48 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 1 Feb 2012 15:48:50 +0000 (10:48 -0500)

Trivial merge