Merge branch 'lscpu' of git://git.kernel.org/pub/scm/linux/kernel/git/heiko/util...

* 'lscpu' of git://git.kernel.org/pub/scm/linux/kernel/git/heiko/util-linux:
  lscpu: add physical cpu address to parseable output
  lscpu: add cpu polarization to parseable output
  lscpu: show dispatching mode
  lscpu: use hypervisor generated topology information
  lscpu: detect IBM hypervisor
  lscpu: fix fallback nthreads calculation
  lscpu: fix cpu map array sizes
  lscpu: fix s390 bogomips detection coding style

diff --cc sys-utils/lscpu.1
Simple merge

diff --cc sys-utils/lscpu.c
Simple merge