[xorg-x11-drv-nvidia/f23: 2/2] Merge branch 'f25' into f23

[Leigh Scott]

commit 968ad1030850b5aaefb048f8cac46288215ce3b1
Merge: 76b80a1 fd75400
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Wed Aug 24 08:44:46 2016 +0100

    Merge branch 'f25' into f23

 .gitignore               | 3 +++
 sources                  | 6 +++---
 xorg-x11-drv-nvidia.spec | 7 +++++--
 3 files changed, 11 insertions(+), 5 deletions(-)
---