]> git.ipfire.org Git - thirdparty/e2fsprogs.git/commitdiff
Merge branch 'maint' into next
authorTheodore Ts'o <tytso@mit.edu>
Mon, 21 Mar 2016 17:21:03 +0000 (13:21 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Mon, 21 Mar 2016 17:21:03 +0000 (13:21 -0400)
1  2 
lib/ext2fs/ismounted.c
lib/ext2fs/mmp.c

Simple merge
Simple merge