[nvidia-340xx-kmod/el7] (72 commits) ...Merge branch 'master' into el7