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-02-23 16:23:00 -05:00
commit 427749861d
11 changed files with 478 additions and 77 deletions