From: Karel Zak Date: Fri, 30 May 2014 10:01:27 +0000 (+0200) Subject: Merge branch 'lscpu-detect-v3' of https://github.com/rudimeier/util-linux X-Git-Tag: v2.25-rc1~62 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3859baf9c50f6e52afee92ddef81e395164c0cea;p=thirdparty%2Futil-linux.git Merge branch 'lscpu-detect-v3' of https://github.com/rudimeier/util-linux * 'lscpu-detect-v3' of https://github.com/rudimeier/util-linux: lscpu: improve vmware detection tests: add lscpu IBM pSeries test data lscpu: detect OS/400 and pHyp hypervisors tests: add vbox lscpu dump lscpu: minor cleanup and improve hypervisor detection --- 3859baf9c50f6e52afee92ddef81e395164c0cea