Merge branch 'for-linville' of git://github.com/lucacoelho/wl12xx
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 11 Oct 2011 19:56:29 +0000 (15:56 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 11 Oct 2011 19:56:29 +0000 (15:56 -0400)

Trivial merge