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

diff --cc drivers/net/tun.c
Simple merge

diff --cc include/net/sock.h
Simple merge

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

diff --cc net/core/netprio_cgroup.c
Simple merge

diff --cc net/core/sock.c
Simple merge

diff --cc net/sched/cls_cgroup.c
Simple merge