From: Karel Zak <kzak@redhat.com>
Date: Mon, 22 Sep 2014 12:43:30 +0000 (+0200)
Subject: Merge branch 'renice' of git://github.com/kerolasa/lelux-utiliteetit
X-Git-Tag: v2.26-rc1~448
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fb2ba0666349ee25edae322ff6a3f0c0c942703f;p=thirdparty%2Futil-linux.git

Merge branch 'renice' of git://github.com/kerolasa/lelux-utiliteetit

* 'renice' of git://github.com/kerolasa/lelux-utiliteetit:
  renice: reorder usage() option descriptions
  rename: add getpriority() message lookup table
  renice: fix numeric uid argument parsing
  renice: avoid having same lines of code twice
  renice: disallow --priority <arg> without pid argument
  rename: use usage and version print out macros
  renice: reorder functions to avoid need of function prototype
---

fb2ba0666349ee25edae322ff6a3f0c0c942703f