Merge remote branch 'nouveau/for-airlied' of nouveau-2.6