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-09 15:44:17 -05:00
commit 09db47b08a
14 changed files with 298 additions and 176 deletions