Merge branch 'for-4.4-fixes' into for-4.5

diff --cc include/linux/cgroup-defs.h
Simple merge

diff --cc kernel/cgroup.c
Simple merge

diff --cc kernel/cpuset.c
Simple merge