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

[Leigh Scott]

commit 3d9468d52fc1c2857f3d786b982c4a34368b86e6
Merge: 0855d1e 1b6e42a
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Wed Aug 10 19:24:38 2016 +0100

    Merge branch 'master' into f24

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