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

diff --cc block/blk-throttle.c
Simple merge

diff --cc block/cfq-iosched.c
Simple merge

diff --cc fs/bio.c
Simple merge

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

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

diff --cc mm/memcontrol.c
Simple merge