[nvidia-kmod/f25: 3/3] fix merge

[Leigh Scott]

commit 332a4cb9c9e62a7cfc4435cbfe922da4624d44ee
Merge: 43277aa c39036f
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Fri Sep 30 08:11:31 2016 +0100

    fix merge

 nv-linux-arm.patch      | 2 +-
 nv-linux-arm2.patch     | 2 +-
 nvidia-4.8_kernel.patch | 8 ++++----
 nvidia-kmod.spec        | 9 ++++++---
 4 files changed, 12 insertions(+), 9 deletions(-)
---