Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 4 Mar 2011 19:00:29 +0000 (14:00 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 4 Mar 2011 19:00:29 +0000 (14:00 -0500)
commit95f84f2959482ee25b5cfe28a048a331ded8667c
treeee15748fa93710bdd81898e9b69acfb73aee8cfd
parenta177584609f7eb2ab1f1c0211bee4ec20d98d892
parent95a776107a131823c87147dff083696d8814c1b3
Merge branch 'for-linville' of git://git./linux/kernel/git/luca/wl12xx