[nvidia-340xx-kmod/f30: 2/2] Merge branch 'master' into f30