Merge branch 'x86/vdso' into x86/core, to resolve conflict and to prepare for dependent changes

 Conflicts:
	arch/x86/entry/vdso/Makefile

We also want to change arch/x86/entry/vdso/Makefile in a followup
commit, so merge the trees for this.

Signed-off-by: Ingo Molnar <mingo@kernel.org>