Merge branch 'linus' into sched/core

Conflicts:
	kernel/Makefile