Merge commit '29ce831000081dd757d3116bf774aafffc4b6b20' into next

[mirror_ubuntu-artful-kernel.git] / kernel / cgroup.c

diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index e31b220a743deda483fe4ec300254affd76f87e0..25c7eb52de1a1f62dfd0354e8e98060717a9df3f 100644 (file)
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -157,7 +157,7 @@ struct css_id {
 };
 
 /*
- * cgroup_event represents events which userspace want to recieve.
+ * cgroup_event represents events which userspace want to receive.
  */
 struct cgroup_event {
        /*