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

[Leigh Scott]

commit 6e118c46c86ce63e2c7caa503765706d0ab870f5
Merge: 8512ae5 61d8b51
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Fri Jul 8 14:52:46 2016 +0100

    Merge branch 'master' into f24

 nvidia-kmod.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---