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