Merge remote-tracking branch 'cgroup/for-next'

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

diff --cc kernel/events/core.c
Simple merge

diff --cc kernel/fork.c
Simple merge

diff --cc kernel/sched/core.c
Simple merge

diff --cc kernel/signal.c
Simple merge

diff --cc mm/memcontrol.c
Simple merge