diff options
| author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
| commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
| tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /include/linux/cgroup.h | |
| parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
| parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) | |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'include/linux/cgroup.h')
| -rw-r--r-- | include/linux/cgroup.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h index e654fa239916..5ac7ebc36dbb 100644 --- a/include/linux/cgroup.h +++ b/include/linux/cgroup.h | |||
| @@ -240,7 +240,7 @@ struct cgroup { | |||
| 240 | /* For RCU-protected deletion */ | 240 | /* For RCU-protected deletion */ |
| 241 | struct rcu_head rcu_head; | 241 | struct rcu_head rcu_head; |
| 242 | 242 | ||
| 243 | /* List of events which userspace want to recieve */ | 243 | /* List of events which userspace want to receive */ |
| 244 | struct list_head event_list; | 244 | struct list_head event_list; |
| 245 | spinlock_t event_list_lock; | 245 | spinlock_t event_list_lock; |
| 246 | }; | 246 | }; |