Merge branch 'master' of ssh://infradead/~/public_git/wireless into for-davem
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 20 Sep 2011 13:19:14 +0000 (09:19 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 20 Sep 2011 13:19:14 +0000 (09:19 -0400)

Trivial merge