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

[nchauvet]

commit f368277f13333ad004904fa2cc3fd314535fc7a7
Merge: 2968532 17fdda7
Author: Nicolas Chauvet <kwizart at gmail.com>
Date:   Fri Jul 1 18:54:55 2016 +0200

    Merge branch 'master' into f24

 nvidia-kmod.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
---