Merge branch 'x86/vdso'