Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx

This commit is contained in:
John W. Linville 2011-03-04 14:00:29 -05:00
commit 95f84f2959
15 changed files with 235 additions and 125 deletions