[xorg-x11-drv-nvidia/el7] (2 commits) ...Merge branch 'master' into el7
Summary of changes:
9bb7058... Add conditions for el7 as there is no wayland (*)
7ad0d08... Merge branch 'master' into el7
(*) This commit already existed in another branch; no separate mail sent