Merge branch 'x86/geode' into x86/urgent