[nvidia-modprobe/f30: 6/6] Merge branch 'master' into f30