Merge branch 'for-4.3/gembird' into for-linus

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/base/cacheinfo.c b/drivers/base/cacheinfo.c
index df0c66cb7ad3..764280a91776 100644
--- a/drivers/base/cacheinfo.c
+++ b/drivers/base/cacheinfo.c
@@ -191,12 +191,12 @@ static int detect_cache_attributes(unsigned int cpu)
         if (ret)
                 goto free_ci;
         /*
-         * For systems using DT for cache hierarcy, of_node and shared_cpu_map
+         * For systems using DT for cache hierarchy, of_node and shared_cpu_map
          * will be set up here only if they are not populated already
          */
         ret = cache_shared_cpu_map_setup(cpu);
         if (ret) {
-                pr_warn("Unable to detect cache hierarcy from DT for CPU %d\n",
+                pr_warn("Unable to detect cache hierarchy from DT for CPU %d\n",
                         cpu);
                 goto free_ci;
         }