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