Merge branch 'master' into for-linus

1 files changed, 1 insertions, 1 deletions

diff --git a/kernel/cpuset.c b/kernel/cpuset.c
index 02b9611eadde..7cb37d86a005 100644
--- a/kernel/cpuset.c
+++ b/kernel/cpuset.c
@@ -105,7 +105,7 @@ struct cpuset {
         /* for custom sched domain */
         int relax_domain_level;
 
-        /* used for walking a cpuset heirarchy */
+        /* used for walking a cpuset hierarchy */
         struct list_head stack_list;
 };