From: Theodore Ts'o <tytso@mit.edu>
Date: Tue, 7 Jun 2016 05:01:22 +0000 (-0400)
Subject: Merge branch 'maint' into next
X-Git-Tag: v1.43.1~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=770d9f5e28ad65afba627d9096ddc8d4e990faca;p=thirdparty%2Fe2fsprogs.git

Merge branch 'maint' into next
---

770d9f5e28ad65afba627d9096ddc8d4e990faca