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