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

[Leigh Scott]

commit 0855d1e1a8dfc48da3a3ebc07cdc866b840f3c87
Merge: 66298c0 f029d66
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Wed Aug 10 19:09:29 2016 +0100

    Merge branch 'master' into f24

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