Merge remote-tracking branch 'tip/auto-latest'

Conflicts:
	arch/x86/kernel/cpu/amd.c
	drivers/char/random.c

diff --cc MAINTAINERS
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/xen/mmu.c
Simple merge