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

[Leigh Scott]

commit fdf267f875706c5b93326fd14822c6b157994166
Merge: 5f31d8d 7fff178
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Fri Jul 8 15:31:36 2016 +0100

    Merge branch 'master' into f24

 nvidia-4.7_kernel-pt1.patch                            | 15 +++++++++++++++
 nvidia-4.7_kernel.patch => nvidia-4.7_kernel_pt2.patch | 15 ---------------
 nvidia-kmod.spec                                       |  6 +++++-
 3 files changed, 20 insertions(+), 16 deletions(-)
---