[xorg-x11-drv-nvidia/f25: 6/6] Merge branch 'master' into f25
commit e647ece40c3e8a53fd63d7a2f01406106bbd5fae
Merge: f4ea70c 2fea97c
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Thu Feb 23 17:05:33 2017 +0000
Merge branch 'master' into f25
xorg-x11-drv-nvidia.spec | 44 ++++++++++++++++++++++++++++++++++++--------
1 file changed, 36 insertions(+), 8 deletions(-)
---