From: Karel Zak <kzak@redhat.com>
Date: Fri, 15 Jun 2012 10:44:17 +0000 (+0200)
Subject: Merge branch '2012wk23' of git://github.com/kerolasa/lelux-utiliteetit
X-Git-Tag: v2.22-rc1~277
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d5f9b6e5fb352c632655e442773df96129cea02d;p=thirdparty%2Futil-linux.git

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

* '2012wk23' of git://github.com/kerolasa/lelux-utiliteetit:
  lsblk: use blkdev_scsi_type_to_name()
  blkdev: add blkdev_scsi_type_to_name()
  wipefs: use symbolic value for markup mode
  eject: inform if CD-ROM drive is not ready
  docs: clean up partx.8 manual
  include: fix void pointer arithmetics warnings
  sysfs: fix printf format warnings
  build: fix unused parameter warnings
  build: fix redundant redeclaration warnings
  include: fix spurious list.h warnings
  uuidd: use output redirection which works [checkbashisms]
  blkid: fix realloc memory leak [cppcheck]
  setarch: do not use -1 as array index [cppcheck]
---

d5f9b6e5fb352c632655e442773df96129cea02d