Merge branch 'maint' into next

author Theodore Ts'o <tytso@mit.edu>

Mon, 16 Feb 2015 15:17:21 +0000 (10:17 -0500)

committer Theodore Ts'o <tytso@mit.edu>

Mon, 16 Feb 2015 15:17:21 +0000 (10:17 -0500)
author Theodore Ts'o <tytso@mit.edu>
Mon, 16 Feb 2015 15:17:21 +0000 (10:17 -0500)
committer Theodore Ts'o <tytso@mit.edu>
Mon, 16 Feb 2015 15:17:21 +0000 (10:17 -0500)
diff --cc e2fsck/pass1.c
Simple merge
diff --cc e2fsck/pass2.c
Simple merge
diff --cc lib/ext2fs/closefs.c
Simple merge
author	Theodore Ts'o <tytso@mit.edu>
	Mon, 16 Feb 2015 15:17:21 +0000 (10:17 -0500)
committer	Theodore Ts'o <tytso@mit.edu>
	Mon, 16 Feb 2015 15:17:21 +0000 (10:17 -0500)
		1	2
e2fsck/pass1.c	patch \|	diff1 \|	diff2 \|	blob \| history
e2fsck/pass2.c	patch \|	diff1 \|	diff2 \|	blob \| history
lib/ext2fs/closefs.c	patch \|	diff1 \|	diff2 \|	blob \| history