Merge pull request #7146 from bgoglin/master

fix typos hlwoc->hwloc

ompi/mca/topo/treematch/treematch/tm_thread_pool.c

@@ -87,7 +87,7 @@ int bind_myself_to_core(hwloc_topology_t topology, int id){
 	hwloc_bitmap_asprintf(&str, obj->cpuset);
 	if(verbose_level>=WARNING)
 	  printf("Thread %d couldn't bind to cpuset %s: %s.\n This thread is not bound to any core...\n", my_core, str, strerror(error));
-	free(str); /* str is allocated by hlwoc, free it normally*/
+	free(str); /* str is allocated by hwloc, free it normally*/
 	return 0;
       }
       /* FREE our cpuset copy */

opal/mca/hwloc/external/configure.m4

@@ -160,7 +160,7 @@ AC_DEFUN([MCA_opal_hwloc_external_CONFIG],[
                                  ]])],
                              [AC_MSG_RESULT([yes])],
                              [AC_MSG_RESULT([no])
-                              opal_hwloc_summary_msg="internal (external hlwoc version is less than internal version 2.0)"
+                              opal_hwloc_summary_msg="internal (external hwloc version is less than internal version 2.0)"
                               AC_MSG_WARN([external hwloc version is less than internal version 2.0])
                               AC_MSG_WARN([using internal hwloc])
                               opal_hwloc_external_support=no])])])