[nvidia-kmod/f24: 2/2] Merge branch 'master' into f24

[Leigh Scott]

commit 3c781e83067bd57b8983e53ca6c88ee818610cb8
Merge: f368277 c5d2cc0
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Fri Jul 1 18:51:19 2016 +0100

    Merge branch 'master' into f24

 nvidia-kmod.spec | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
---