Merge branch 'master' of git://git.infradead.org/users/linville/wireless into for...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 15 Sep 2011 19:37:02 +0000 (15:37 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 15 Sep 2011 19:37:02 +0000 (15:37 -0400)

Trivial merge