Merge branch 'for-linus' into for-next

Conflicts:
	mm/percpu.c