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

This commit is contained in:
John W. Linville 2013-06-18 14:45:21 -04:00
commit 9e49a9d3d6
10 changed files with 367 additions and 254 deletions