]> git.ipfire.org Git - thirdparty/e2fsprogs.git/commitdiff
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)
1  2 
lib/ext2fs/swapfs.c

Simple merge