Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 22 Feb 2012 19:44:50 +0000 (14:44 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 22 Feb 2012 19:44:50 +0000 (14:44 -0500)
commit8715d941b2fa8591474e7d0dad66589fce1892d2
treeec228ec158bb5b4424f898d336279c29de4cf81f
parentca994a36f585432458ead9133fcfe05440edbb7b
parent51c4ed95a857ded6017537fd53fa00db64908954
Merge branch 'for-linville' of git://git./linux/kernel/git/luca/wl12xx