Merge branch 'wl12xx-next' into for-linville