[xorg-x11-drv-nvidia/f25: 6/6] Merge branch 'master' into f25

[Leigh Scott]

commit e6141b3958e4927b31cc3d1854d40929a1a665cb
Merge: 12dec79 d11d966
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Fri Sep 30 07:32:02 2016 +0100

    Merge branch 'master' into f25

 00-ignoreabi.conf        |  4 ++++
 xorg-x11-drv-nvidia.spec | 10 +++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)
---