[nvidia-340xx-kmod/el7: 72/72] Merge branch 'master' into el7