[nvidia-kmod/el7: 22/22] Merge branch 'master' into el7