From: Karel Zak Date: Mon, 10 Jul 2017 08:15:22 +0000 (+0200) Subject: Merge branch 'help' of https://github.com/rudimeier/util-linux X-Git-Tag: v2.31-rc1~229 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6d53d1f99ab3405374e0ebe6c7e9d10d13074dcc;p=thirdparty%2Futil-linux.git Merge branch 'help' of https://github.com/rudimeier/util-linux * 'help' of https://github.com/rudimeier/util-linux: setpriv: silence compiler warning misc: consolidate macro style USAGE_HELP_OPTIONS blockdev: correct man page name in --help --- 6d53d1f99ab3405374e0ebe6c7e9d10d13074dcc