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

This commit is contained in:
John W. Linville 2010-12-16 15:21:33 -05:00
commit 5928b91aca
17 changed files with 848 additions and 324 deletions