Commits

Merge branch 'wl12xx-next' into for-linville Conflicts: drivers/net/wireless/ti/wl12xx/main.c drivers/net/wireless/ti/wlcore/wlcore.h
Merge branch 'wl12xx-next' into for-linville Conflicts: drivers/net/wireless/ti/wl12xx/main.c drivers/net/wireless/ti/wlcore/wlcore.h