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