[hwloc/f15] (29 commits) ...fix merge

[Peter Robinson]

Summary of changes:

  b0382fc... Update to 1.2 (*)
  51ef7b1... Update to version 1.2 (*)
  d96bdb1... Deleted unsused patch file. (*)
  dddacc6... Updating branches (*)
  67ccf7d... f16 (*)
  4137c0d... f15 (*)
  e1c5ec1... f16 (*)
  38f78a5... f15 (*)
  c430a80... f15 (*)
  28ed9c7... f15 (*)
  814bd3c... f15 (*)
  c467cd6... f15 (*)
  14777e0... f15 (*)
  105490f... f15 (*)
  b1d655e... f15 (*)
  0668b70... f15 (*)
  ba83bfb... f15 (*)
  5c8bb12... f15 (*)
  1f5c7b0... f15 (*)
  c39bd8a... f15 (*)
  b2d2585... Version 1.2 (*)
  a8a8fb6... Version 1.2 (*)
  c045076... Version 1.2 (*)
  5c0a501... Update to 1.2.1 (*)
  255b133... Update to 1.2.2 (*)
  14f0f68... Fix minor packaging issue (*)
  e2dc92b... Update to 1.3 (*)
  39da1eb... Update build for ARM support (*)
  ea6abca... fix merge

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