[xorg-x11-drv-nvidia/el7: 7/7] Merge branch 'f32' into el7