From: Karel Zak <kzak@redhat.com>
Date: Fri, 28 Mar 2014 09:51:17 +0000 (+0100)
Subject: Merge branch 'fix-ipcs-q-fallback' of https://github.com/rudimeier/util-linux
X-Git-Tag: v2.25-rc1~399
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=742b128523eb8757c7a60e53bcf9c8c178c3175c;p=thirdparty%2Futil-linux.git

Merge branch 'fix-ipcs-q-fallback' of https://github.com/rudimeier/util-linux

* 'fix-ipcs-q-fallback' of https://github.com/rudimeier/util-linux:
  travis-ci: abort if make check fails
  ipcs: fix memleak in ipc_*_get_info functions
  ipcs: fix ipc_sem_get_info fallback case
  ipcs: fix ipc_shm_get_info fallback case
  ipcs: fix ipc_msg_get_info fallback case
  tests: add basic test case for ipcs -m -i n
  tests: add basic test case for ipcs -s -i n
  tests: add basic test case for ipcs -q -i n
  tests: quote generated arguments for ipcrm
  ipcs: cleanup jumplabel stlyes
---

742b128523eb8757c7a60e53bcf9c8c178c3175c