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

This commit is contained in:
John W. Linville 2012-06-22 14:41:57 -04:00
commit d217249d72
17 changed files with 332 additions and 109 deletions