[nvidia-kmod/f40] (4 commits) ...Merge branch 'master' into f40