Merge branch 'x86/microcode'

Conflicts:
	arch/x86/kernel/cpu/amd.c