Merge branch 'maint' into next

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

Thu, 6 Mar 2014 15:53:34 +0000 (10:53 -0500)

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

Thu, 6 Mar 2014 15:53:34 +0000 (10:53 -0500)
author Theodore Ts'o <tytso@mit.edu>
Thu, 6 Mar 2014 15:53:34 +0000 (10:53 -0500)
committer Theodore Ts'o <tytso@mit.edu>
Thu, 6 Mar 2014 15:53:34 +0000 (10:53 -0500)
diff --cc e2fsck/unix.c
Simple merge
diff --cc e2fsck/util.c
Simple merge
diff --cc misc/mke2fs.c
Simple merge
author	Theodore Ts'o <tytso@mit.edu>
	Thu, 6 Mar 2014 15:53:34 +0000 (10:53 -0500)
committer	Theodore Ts'o <tytso@mit.edu>
	Thu, 6 Mar 2014 15:53:34 +0000 (10:53 -0500)
		1	2
e2fsck/unix.c	patch \|	diff1 \|	diff2 \|	blob \| history
e2fsck/util.c	patch \|	diff1 \|	diff2 \|	blob \| history
misc/mke2fs.c	patch \|	diff1 \|	diff2 \|	blob \| history