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

[Leigh Scott]

commit d5f68d0d0f4e2d0079b5b3b371b5954d0f433a18
Merge: 3d9468d 8e67369
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Wed Aug 17 15:52:53 2016 +0100

    Merge branch 'master' into f24

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