Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 30 Jun 2011 15:26:04 +0000 (11:26 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 30 Jun 2011 15:26:04 +0000 (11:26 -0400)

Trivial merge