summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2017-02-02 21:50:35 +0300
committerTejun Heo <tj@kernel.org>2017-02-02 21:50:35 +0300
commit63f1ca59453aadae81f702840c7ac6ea8b9f9262 (patch)
tree5dc559d4dc33c8e1408f757d8853b23033ea118f /fs
parent576dd464505fc53d501bb94569db76f220104d28 (diff)
parent7896dfb0a6180beb51bf34b32c9427984cb052c4 (diff)
downloadlinux-63f1ca59453aadae81f702840c7ac6ea8b9f9262.tar.xz
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: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions