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-01-28 15:33:16 -05:00
commit cbdbc5eb54
21 changed files with 2175 additions and 459 deletions