Merge branch 'linus' into cpus4096

Conflicts:
	kernel/trace/ring_buffer.c

diff --cc arch/x86/kernel/Makefile
Simple merge

diff --cc include/linux/sched.h
Simple merge

diff --cc kernel/profile.c
Simple merge

diff --cc kernel/sched.c
Simple merge

diff --cc kernel/sysctl.c
Simple merge