[xorg-x11-drv-nvidia/f25] (4 commits) ...fix merge

[Leigh Scott]

Summary of changes:

  c3441e3... Update to 370.23 beta (*)
  78f133d... Update to 370.28 (*)
  0890182... glvnd lib needed for non-glvnd setup (*)
  7ed2449... fix merge

(*) This commit already existed in another branch; no separate mail sent