Merge branch 'linus'

Conflicts:
	arch/x86/mm/init.c