[xorg-x11-drv-nvidia/f25] (6 commits) ...Merge branch 'master' into f25

[Leigh Scott]

Summary of changes:

  3af5c0c... add xorg abi override (*)
  0079640... add xorg abi override (*)
  bed268e... fix source number (*)
  6cdb041... fix override file (*)
  d11d966... edit changelog (*)
  e6141b3... Merge branch 'master' into f25

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