[nvidia-kmod/el7: 28/28] fix merge
commit c962cbb738aa775a67e1aea25fc45780847ab532
Merge: 489ed6c ee5c7bb
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Tue Oct 30 22:45:24 2018 +0000
fix merge
nv-linux-arm.patch | 13 ---------
nv-linux-arm2.patch | 12 --------
nvidia-kmod.spec | 81 ++++++++++++++++++++++++++++++++++++++++++++---------
3 files changed, 68 insertions(+), 38 deletions(-)
---