[xorg-x11-drv-nvidia/el7] (3 commits) ...Merge branch 'f32' into el7