diff options
| author | LaMont Jones <lamont@debian.org> | 2010-08-02 23:02:28 -0600 |
|---|---|---|
| committer | LaMont Jones <lamont@debian.org> | 2010-08-02 23:02:28 -0600 |
| commit | 0864d694ca05ea9383ef09bc1bc3a182e15e2ffa (patch) | |
| tree | 2e5237f1d4e2cac2efad97ce31abc386c1e37b6d /tests/expected/lscpu/lscpu-x86_64-ibme326m | |
| parent | 3cbdfd84fde6159d7778e70618fbbc8df219cafe (diff) | |
| parent | 6c91f5e3e1de32c45ea0b38227ce35eb43eb2ebc (diff) | |
| download | util-linux-old-0864d694ca05ea9383ef09bc1bc3a182e15e2ffa.tar.gz | |
Merge remote branch 'origin/master'
Conflicts:
mount/Makefile.am
sys-utils/ipcs.c
tests/ts/blkid/images-fs/befs.img.bz2
tests/ts/blkid/images-fs/ddf-raid.img.bz2
Diffstat (limited to 'tests/expected/lscpu/lscpu-x86_64-ibme326m')
| -rw-r--r-- | tests/expected/lscpu/lscpu-x86_64-ibme326m | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/expected/lscpu/lscpu-x86_64-ibme326m b/tests/expected/lscpu/lscpu-x86_64-ibme326m index a373aacc..ccc64a07 100644 --- a/tests/expected/lscpu/lscpu-x86_64-ibme326m +++ b/tests/expected/lscpu/lscpu-x86_64-ibme326m @@ -12,6 +12,7 @@ CPU MHz: 1995.058 L1d cache: 1024K L1i cache: 1024K L2 cache: 1024K +NUMA node0 CPU(s): 0,1 # The following is the parsable format, which can be fed to other # programs. Each different item in every column has an unique ID |