[nvidia-kmod/f24: 3/3] Merge branch 'f25' into f24