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

author Stephen Rothwell <sfr@canb.auug.org.au>

Tue, 13 Sep 2016 02:53:12 +0000 (12:53 +1000)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Tue, 13 Sep 2016 02:53:12 +0000 (12:53 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Sep 2016 02:53:12 +0000 (12:53 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Sep 2016 02:53:12 +0000 (12:53 +1000)
diff --cc fs/kernfs/dir.c
Simple merge
diff --cc include/linux/cgroup.h
Simple merge
diff --cc kernel/cgroup.c
Simple merge
diff --cc kernel/sched/debug.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 13 Sep 2016 02:53:12 +0000 (12:53 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 13 Sep 2016 02:53:12 +0000 (12:53 +1000)
		1	2
fs/kernfs/dir.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/cgroup.h	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/cgroup.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/sched/debug.c	patch \|	diff1 \|	diff2 \|	blob \| history