diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-03-25 14:18:20 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-03-25 14:18:20 +1100 |
| commit | 06ec1e05b04774505addc5ba00c0bcce29596697 (patch) | |
| tree | d608f68ef89528281ce849274411cd447da0ef78 /kernel | |
| parent | e3d69511074c77b91694ed16ab27a1e38bf2d036 (diff) | |
| parent | f722377bfa869c9c1abeca88266bb4cfd3a5d06d (diff) | |
Merge remote branch 'trivial/for-next'
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/cgroup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c index e2769e13980c..06dbf97a7590 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c @@ -3609,7 +3609,7 @@ static void __init cgroup_init_subsys(struct cgroup_subsys *ss) * @ss: the subsystem to load * * This function should be called in a modular subsystem's initcall. If the - * subsytem is built as a module, it will be assigned a new subsys_id and set + * subsystem is built as a module, it will be assigned a new subsys_id and set * up for use. If the subsystem is built-in anyway, work is delegated to the * simpler cgroup_init_subsys. */ |