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