[nvidia-kmod/f30: 8/8] Merge branch 'master' into f30