[xorg-x11-drv-nvidia/f23] (16 commits) ...fix merge

[Leigh Scott]

Summary of changes:

  901badb... Disable armhfp for now (*)
  6af1ad6... Revert "Disable armhfp for now" (*)
  c8a618c... Merge branch 'master' into f24 (*)
  e2630fc... Merge branch 'master' into f24 (*)
  f928a22... Merge branch 'master' into f24 (*)
  a0166dc... Merge branch 'master' into f24 (*)
  27fa710... Merge branch 'master' into f24 (*)
  66298c0... Merge branch 'master' into f24 (*)
  0855d1e... Merge branch 'master' into f24 (*)
  3d9468d... Merge branch 'master' into f24 (*)
  d5f68d0... Merge branch 'master' into f24 (*)
  47afd92... Merge branch 'master' into f24 (*)
  3110819... Revert "Update to 370.23 beta" (*)
  f5a8246... Merge branch 'f25' into f24 (*)
  601ebc3... Update to 367.57 (*)
  7b1b322... fix merge

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