[nvidia-kmod/el7] (12 commits) ...Merge branch 'f30' into el7