]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'cgroup/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 8 Mar 2016 03:40:52 +0000 (14:40 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 8 Mar 2016 03:40:52 +0000 (14:40 +1100)
1  2 
Documentation/cgroup-v2.txt
Documentation/kernel-parameters.txt
fs/kernfs/dir.c
init/Kconfig
kernel/sched/core.c

Simple merge
Simple merge
diff --cc fs/kernfs/dir.c
Simple merge
diff --cc init/Kconfig
Simple merge
Simple merge