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)
commit85a8eefdc9ee5ec222fb146a4df5d67c306488c4
treeaa6929ffc9ec2a909e63b9f0125f78101e11164c
parentbb8f2cb284f1afa430a252d306d2bb29f6b9ce64
parent6b661895a195f244097a60d4d4c9f09983d7efc7
Merge branch 'for-linville' of git://github.com/lucacoelho/wl12xx