[wl-kmod/el7: 11/11] Merge branch 'master' into el7