[nvidia-xconfig/f28: 4/4] Merge branch 'master' into f28