[nvidia-kmod/f24: 7/7] fix merge
commit 8a68c941d4555c0c6e2123ffc6f878f75cbcde35
Merge: b9f5a82 e9bdd6f
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Mon Dec 19 11:57:22 2016 +0000
fix merge
nv-linux-arm.patch | 2 +-
nv-linux-arm2.patch | 2 +-
nvidia-4.8_kernel.patch | 81 -------------------------------------------------
nvidia-kmod.spec | 21 ++++++++-----
4 files changed, 16 insertions(+), 90 deletions(-)
---