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

Trivial merge