[nvidia-xconfig/el7] (2 commits) ...Merge branch 'f32' into el7