[xorg-x11-drv-nvidia-340xx/el7] (5 commits) ...Merge branch 'master' into el7

Summary of changes: 68d4ca2... Bypass desktop validation for el6 (*) 6319ade... Fixup el6 desktop validation (*) 70eff04... Drop isa requires on -cuda sub-package (*) d34ffdc... Drop isa requires on -cuda (*) 507b835... Merge branch 'master' into el7 (*) This commit already existed in another branch; no separate mail sent