[nvidia-kmod/el7: 106/106] fix merge
commit 8967f85b82ceb7859347ca34d70f21e6643819c6
Merge: 155ce9c e9bdd6f
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Jan 18 13:28:34 2017 +0000
fix merge
.gitignore | 2 +-
3.18_kernel.patch | 23 ---
3.19_kernel.patch | 40 ----
4.0.0_kernel.patch | 28 ---
nv-linux-arm.patch | 10 +-
nv-linux-arm2.patch | 12 ++
nvidia-kmod.spec | 307 ++++++++++++++-----------------
nvidia-kmodtool-excludekernel-filterfile | 2 +-
sources | 3 +
9 files changed, 162 insertions(+), 265 deletions(-)
---
diff --cc sources
index fbfb0c3,e69de29..7f959aa
--- a/sources
+++ b/sources
@@@ -1,1 -1,0 +1,4 @@@
++<<<<<<< HEAD
+7c9823a01dbbffca386a8e399997addc nvidia-kmod-data-331.113.tar.xz
++=======
++>>>>>>> master