Merge branch 'linus' into x86/mm

Conflicts:
	arch/x86/mm/fault.c