[xorg-x11-drv-nvidia/f36] (2 commits) ...Merge branch 'master' into f36
Summary of changes:
7993e83... fix build and clean up (*)
8e9dc4d... Merge branch 'master' into f36
(*) This commit already existed in another branch; no separate mail sent