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

[Leigh Scott]

commit 01510f4f3d0dcfc7393bf8f43ef7de3838a07fc5
Merge: e6141b3 e02f136
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Fri Sep 30 07:43:08 2016 +0100

    Merge branch 'master' into f25

 xorg-x11-drv-nvidia.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---