[hwloc/f16] (2 commits) ...Merge branch 'master' into f16

[Dan Horák]

Summary of changes:

  47a0dd5... no InfiniBand on s390(x) (*)
  aa84abb... Merge branch 'master' into f16

(*) This commit already existed in another branch; no separate mail sent