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