Skip to content
Commit 63f1ca59 authored by Tejun Heo's avatar Tejun Heo
Browse files

Merge branch 'cgroup/for-4.11-rdmacg' into cgroup/for-4.11



Merge in to resolve conflicts in Documentation/cgroup-v2.txt.  The
conflicts are from multiple section additions and trivial to resolve.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parents 576dd464 7896dfb0
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment