[nvidia-persistenced/f30: 7/7] Merge branch 'master' into f30
commit 162b80602019a80faf7c79d8d1d8bea46d5aea1d
Merge: cc82487 85dc442
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Thu Aug 1 21:10:36 2019 +0100
Merge branch 'master' into f30
---