[xorg-x11-drv-nvidia/f24: 2/2] Merge branch 'master' into f24
commit 4516cfe7e027c9b173144d92172b10c8be5e5dd3
Merge: 5ace704 3f492e5
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sat Dec 24 14:11:41 2016 +0000
Merge branch 'master' into f24
nvidia.conf | 10 +++++++++-
xorg-x11-drv-nvidia.spec | 5 ++++-
2 files changed, 13 insertions(+), 2 deletions(-)
---