Merge branch 'linus' into x86/quirks

Conflicts:
	arch/x86/kernel/early-quirks.c