Merge branch 'master' of ssh://infradead/~/public_git/wireless-next into for-davem
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 19 Sep 2011 19:00:16 +0000 (15:00 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 19 Sep 2011 19:00:16 +0000 (15:00 -0400)

Trivial merge