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

[Leigh Scott]

commit f5a82461c134222dee2eb24db97e87439ab087aa
Merge: 3110819 fd75400
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Wed Aug 24 08:44:31 2016 +0100

    Merge branch 'f25' into f24

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