From: Karel Zak <kzak@redhat.com>
Date: Thu, 8 Jan 2015 13:53:01 +0000 (+0100)
Subject: Merge branch '2015wk01' of https://github.com/kerolasa/lelux-utiliteetit
X-Git-Tag: v2.26-rc1~62
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d9644f30de6eb4bf015f840ad895260f7276f5c;p=thirdparty%2Futil-linux.git

Merge branch '2015wk01' of https://github.com/kerolasa/lelux-utiliteetit

* '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
---

3d9644f30de6eb4bf015f840ad895260f7276f5c