db5bc72496
(cherry picked from commit open-mpi/hwloc@6c75302ab2) Conflicts: opal/mca/hwloc/hwloc191/hwloc/include/hwloc.h Signed-off-by: Jeff Squyres <jsquyres@cisco.com>