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