| commit | 63f1ca59453aadae81f702840c7ac6ea8b9f9262 | [log] [tgz] |
|---|---|---|
| author | Tejun Heo <tj@kernel.org> | Thu Feb 02 13:50:35 2017 -0500 |
| committer | Tejun Heo <tj@kernel.org> | Thu Feb 02 13:50:35 2017 -0500 |
| tree | 5dc559d4dc33c8e1408f757d8853b23033ea118f | |
| parent | 576dd464505fc53d501bb94569db76f220104d28 [diff] | |
| parent | 7896dfb0a6180beb51bf34b32c9427984cb052c4 [diff] |
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>