git.ipfire.org Git - thirdparty/e2fsprogs.git/commit

]> git.ipfire.org Git - thirdparty/e2fsprogs.git/commit

projects / thirdparty / e2fsprogs.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 19c5d41 115d4b4)

author	Theodore Ts'o <tytso@mit.edu>
	Sun, 10 Aug 2014 23:33:31 +0000 (19:33 -0400)
committer	Theodore Ts'o <tytso@mit.edu>
	Sun, 10 Aug 2014 23:33:31 +0000 (19:33 -0400)
commit	68083287ae95dce9b610c94b28f95cb702d4c98f
tree	caa0f37e7b143068338d1ea09d1f0a2ebd08fa6e	tree \| snapshot
parent	19c5d41d5cb393d293bcd67647883a2f86a253c5	commit \| diff
parent	115d4b4b33540da49e5d04135417392f7c4d54fc	commit \| diff

Merge branch 'maint' into next

Conflicts:
e2fsck/unix.c

e2fsck/problem.c	diff1 \|	diff2 \|	blob \| history
e2fsck/problem.h	diff1 \|	diff2 \|	blob \| history
e2fsck/super.c	diff1 \|	diff2 \|	blob \| history
e2fsck/unix.c	diff1 \|	diff2 \|	blob \| history
lib/ext2fs/closefs.c	diff1 \|	diff2 \|	blob \| history
lib/ext2fs/openfs.c	diff1 \|	diff2 \|	blob \| history
resize/resize2fs.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.