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

[Leigh Scott]

commit fda966e3bee9e14be81a61b010a333a82daee391
Merge: fdf267f 9613f98
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Sun Jul 17 14:50:42 2016 +0100

    Merge branch 'master' into f24

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