diff options
| author | James Morris <james.l.morris@oracle.com> | 2014-11-19 05:32:12 -0500 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-11-19 05:32:12 -0500 |
| commit | b10778a00d40b3d9fdaaf5891e802794781ff71c (patch) | |
| tree | 6ba4cbac86eecedc3f30650e7f764ecf00c83898 /net/core/netclassid_cgroup.c | |
| parent | 594081ee7145cc30a3977cb4e218f81213b63dc5 (diff) | |
| parent | bfe01a5ba2490f299e1d2d5508cbbbadd897bbe9 (diff) | |
Merge commit 'v3.17' into next
Diffstat (limited to 'net/core/netclassid_cgroup.c')
| -rw-r--r-- | net/core/netclassid_cgroup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/netclassid_cgroup.c b/net/core/netclassid_cgroup.c index 30d903b19c62..1f2a126f4ffa 100644 --- a/net/core/netclassid_cgroup.c +++ b/net/core/netclassid_cgroup.c | |||
| @@ -107,5 +107,5 @@ struct cgroup_subsys net_cls_cgrp_subsys = { | |||
| 107 | .css_online = cgrp_css_online, | 107 | .css_online = cgrp_css_online, |
| 108 | .css_free = cgrp_css_free, | 108 | .css_free = cgrp_css_free, |
| 109 | .attach = cgrp_attach, | 109 | .attach = cgrp_attach, |
| 110 | .base_cftypes = ss_files, | 110 | .legacy_cftypes = ss_files, |
| 111 | }; | 111 | }; |