From: Karel Zak <kzak@redhat.com>
Date: Thu, 31 Jul 2014 08:55:38 +0000 (+0200)
Subject: Merge branch 'travis' of git://github.com/kerolasa/lelux-utiliteetit
X-Git-Tag: v2.26-rc1~558
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f9afb37d1acbe3d192a3ac8017fa4fd424221244;p=thirdparty%2Futil-linux.git

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

* 'travis' of git://github.com/kerolasa/lelux-utiliteetit:
  tests: fix rename subdir check that was failing in travis
  build-sys: remove swap-common.h from sys-utils/Makemodule.am
---

f9afb37d1acbe3d192a3ac8017fa4fd424221244