[xorg-x11-drv-nvidia/f24: 3/3] Merge branch 'master' into f24

[Leigh Scott]

commit e2630fc6f8daf06c84fa46e0a9d29267a9253f10
Merge: c8a618c a8a1ef2
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Sat Jul 16 18:45:22 2016 +0100

    Merge branch 'master' into f24

 xorg-x11-drv-nvidia.spec | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)
---