From: Karel Zak <kzak@redhat.com>
Date: Mon, 14 Jul 2014 14:03:48 +0000 (+0200)
Subject: Merge branch 'minor-fixes' of git://github.com/kerolasa/lelux-utiliteetit
X-Git-Tag: v2.25~75
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2fa32bea49992d5adeac2a37a42e97241ee73439;p=thirdparty%2Futil-linux.git

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

* 'minor-fixes' of git://github.com/kerolasa/lelux-utiliteetit:
  lscpu: avoid double free
  libsmartcols: avoid variable dereference after release
  libfdisk: do not do the same thing twice in single if statement
  whereis: avoid printing uninitialized string
  setpriv: avoid alloca() use xmalloc() instead
  dmesg: avoid unnecessary variable assignment
  fdisk: avoid code duplication
  mkfs.cramfs: use defined failure name rather than magic value
  fdformat: match variable and print format types
  cfdisk: add braces to ensure operation order
  lscpu: avoid use of bzero() in favor of memset()
  setterm: remove unnecessary variable
  cal: remove unnused structure and definition
  textual: fix some typos
---

2fa32bea49992d5adeac2a37a42e97241ee73439