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

[Leigh Scott]

commit 66298c0e4df0a3f7660abd0a5b7114334b2151bb
Merge: 27fa710 d0d08f1
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Wed Aug 10 18:15:11 2016 +0100

    Merge branch 'master' into f24

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