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-05-05 13:56:27 -04:00
commit 890641b251
16 changed files with 852 additions and 280 deletions