Merge branch 'for-3.12' into for-next

author Tejun Heo <tj@kernel.org>

Wed, 31 Jul 2013 10:21:04 +0000 (06:21 -0400)

committer Tejun Heo <tj@kernel.org>

Wed, 31 Jul 2013 10:21:04 +0000 (06:21 -0400)
author Tejun Heo <tj@kernel.org>
Wed, 31 Jul 2013 10:21:04 +0000 (06:21 -0400)
committer Tejun Heo <tj@kernel.org>
Wed, 31 Jul 2013 10:21:04 +0000 (06:21 -0400)
diff --cc include/linux/cgroup.h
Simple merge
diff --cc kernel/cgroup.c
Simple merge
author	Tejun Heo <tj@kernel.org>
	Wed, 31 Jul 2013 10:21:04 +0000 (06:21 -0400)
committer	Tejun Heo <tj@kernel.org>
	Wed, 31 Jul 2013 10:21:04 +0000 (06:21 -0400)
		1	2
include/linux/cgroup.h	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/cgroup.c	patch \|	diff1 \|	diff2 \|	blob \| history