[xorg-x11-drv-nvidia] (82 commits) Non-fast-forward update to branch master