[xorg-x11-drv-nvidia/f25: 20/20] Merge branch 'master' into f25
commit 1b9db36c16fdffe5365486413337cc1c19f67d6f
Merge: 1a8f4a4 128fa72
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Tue Jul 25 00:08:47 2017 +0100
Merge branch 'master' into f25
---