]> git.ipfire.org Git - thirdparty/e2fsprogs.git/commit - lib/et/error_message.c
Merge branch 'maint' into next
authorTheodore Ts'o <tytso@mit.edu>
Thu, 4 Jan 2018 02:38:24 +0000 (21:38 -0500)
committerTheodore Ts'o <tytso@mit.edu>
Thu, 4 Jan 2018 02:38:24 +0000 (21:38 -0500)
commitf077fce7e6918bd97070c558190140306e795a8c
tree074d335ceba8f1354fe2648f1941f05105f1d1d7
parentdf22ead1bae8f97eea36976fd354bb05042ad92b
parent4aa7cff6a3ba9ad4ec06b8c7307e639d40974c77
Merge branch 'maint' into next
lib/ext2fs/swapfs.c