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