Merge branch 'for-linville' of git://github.com/lucacoelho/wl12xx
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 16 Sep 2011 20:20:43 +0000 (16:20 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 16 Sep 2011 20:20:43 +0000 (16:20 -0400)

Trivial merge