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

[Leigh Scott]

commit 8512ae506a5243cc8056640a6dd4ffd528fd1157
Merge: 5119729 52cadb0
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Fri Jul 8 14:42:08 2016 +0100

    Merge branch 'master' into f24

 nvidia-4.7_kernel.patch | 61 +++++++++++++++++++++++++++++++++++++++++++++++++
 nvidia-kmod.spec        |  9 ++++++--
 2 files changed, 68 insertions(+), 2 deletions(-)
---