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

drivers/net/wireless/wl12xx/Kconfig

drivers/net/wireless/wl12xx/acx.c

drivers/net/wireless/wl12xx/acx.h

drivers/net/wireless/wl12xx/boot.c

drivers/net/wireless/wl12xx/cmd.c

drivers/net/wireless/wl12xx/cmd.h

drivers/net/wireless/wl12xx/conf.h

drivers/net/wireless/wl12xx/debugfs.c

drivers/net/wireless/wl12xx/event.c

drivers/net/wireless/wl12xx/ini.h

drivers/net/wireless/wl12xx/init.c

drivers/net/wireless/wl12xx/io.c

drivers/net/wireless/wl12xx/io.h

drivers/net/wireless/wl12xx/main.c

drivers/net/wireless/wl12xx/ps.c

drivers/net/wireless/wl12xx/rx.c

drivers/net/wireless/wl12xx/rx.h

drivers/net/wireless/wl12xx/scan.c

drivers/net/wireless/wl12xx/scan.h

drivers/net/wireless/wl12xx/sdio.c