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