Merge branch 'x86/gart' into x86/core