[xorg-x11-drv-nvidia/el7] (3 commits) ...Merge branch 'master' into el7
Summary of changes:
d0fb7e0... Use different output class for rhel as it chokes on options (*)
fbb3968... Revert "Rebuilt for multilibs"
7016f54... Merge branch 'master' into el7
(*) This commit already existed in another branch; no separate mail sent