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

[Leigh Scott]

commit 5119729f1963770f4f6408f17de1b59e8377ddb6
Merge: 3c781e8 2a4cf50
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Fri Jul 1 18:56:28 2016 +0100

    Merge branch 'master' into f24

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