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

Conflicts:
	Documentation/feature-removal-schedule.txt

diff --cc Documentation/feature-removal-schedule.txt
index 03ca210406edfcbe90fc58cd006ef0e7d313b42f,5298e126cea380d6ec88f6fda678e8c3720e8f38..1fafa401a1c536a8f57480ff93a946fe2728eab0
--- 1/Documentation/feature-removal-schedule.txt
--- 2/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@@ -534,8 -542,9 +534,17 @@@ Who:      Kees Cook <keescook@chromium.org
  
  ----------------------------
  
+ What: cgroup option updates via remount
+ When: March 2013
+ Why:  Remount currently allows changing bound subsystems and
+       release_agent.  Rebinding is hardly useful as it only works
+       when the hierarchy is empty and release_agent itself should be
+       replaced with conventional fsnotify.
++
++----------------------------
++
 +What: setitimer accepts user NULL pointer (value)
 +When: 3.6
 +Why:  setitimer is not returning -EFAULT if user pointer is NULL. This
 +      violates the spec.
 +Who:  Sasikantha Babu <sasikanth.v19@gmail.com>

diff --cc kernel/cpuset.c
Simple merge

diff --cc mm/memcontrol.c
Simple merge

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