]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
Merge branch 'chcpu' of git://git.kernel.org/pub/scm/linux/kernel/git/heiko/util...
authorKarel Zak <kzak@redhat.com>
Wed, 31 Aug 2011 09:49:27 +0000 (11:49 +0200)
committerKarel Zak <kzak@redhat.com>
Wed, 31 Aug 2011 09:49:27 +0000 (11:49 +0200)
* 'chcpu' of git://git.kernel.org/pub/scm/linux/kernel/git/heiko/util-linux:
  chcpu: new tool
  cpuset: add option to allow cpulist_parse() to fail

1  2 
sys-utils/lscpu.1
sys-utils/lscpu.c

Simple merge
Simple merge