tree aa6929ffc9ec2a909e63b9f0125f78101e11164c
parent bb8f2cb284f1afa430a252d306d2bb29f6b9ce64
parent 6b661895a195f244097a60d4d4c9f09983d7efc7
author John W. Linville <linville@tuxdriver.com> 1317147623 -0400
committer John W. Linville <linville@tuxdriver.com> 1317147623 -0400

Merge branch 'for-linville' of git://github.com/lucacoelho/wl12xx