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

[Leigh Scott]

commit f928a22c36b82494fcc79c42762d4acd1f3202db
Merge: e2630fc ed392b8
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Sat Jul 16 19:19:21 2016 +0100

    Merge branch 'master' into f24

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