[nvidia-340xx-kmod/f31: 3/3] Merge branch 'master' into f31