[nvidia-open-kmod/f36: 4/4] Merge branch 'master' into f36