]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
Merge branch '2015wk01' of https://github.com/kerolasa/lelux-utiliteetit
authorKarel Zak <kzak@redhat.com>
Thu, 8 Jan 2015 13:53:01 +0000 (14:53 +0100)
committerKarel Zak <kzak@redhat.com>
Thu, 8 Jan 2015 13:53:01 +0000 (14:53 +0100)
* '2015wk01' of https://github.com/kerolasa/lelux-utiliteetit:
  eject: add verbosity to cdrom door lock error
  libblkid: assume strtoull() is available
  ipcs: remove FIXME markup
  ul: remove unexplained TERM=lpr override
  look: remove dead code
  docs: make tools/checkmans.sh to pass without warnings
  build-sys: fix make checkincludes warnings
  docs: add howto-pull-request.txt
  docs: small improvements to howto-contribute.txt

Conflicts:
Documentation/howto-pull-request.txt


Trivial merge