[xorg-x11-drv-nvidia/f29] (24 commits) ...clean up