Merge branch 'maint' into next

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

Thu, 6 Feb 2014 20:39:28 +0000 (15:39 -0500)

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

Thu, 6 Feb 2014 20:39:28 +0000 (15:39 -0500)
author Theodore Ts'o <tytso@mit.edu>
Thu, 6 Feb 2014 20:39:28 +0000 (15:39 -0500)
committer Theodore Ts'o <tytso@mit.edu>
Thu, 6 Feb 2014 20:39:28 +0000 (15:39 -0500)
diff --cc configure
Simple merge
diff --cc configure.in
Simple merge
diff --cc lib/ext2fs/extent.c
Simple merge
diff --cc misc/mke2fs.c
Simple merge
diff --cc misc/tune2fs.c
Simple merge
author	Theodore Ts'o <tytso@mit.edu>
	Thu, 6 Feb 2014 20:39:28 +0000 (15:39 -0500)
committer	Theodore Ts'o <tytso@mit.edu>
	Thu, 6 Feb 2014 20:39:28 +0000 (15:39 -0500)
		1	2
configure	patch \|	diff1 \|	diff2 \|	blob \| history
configure.in	patch \|	diff1 \|	diff2 \|	blob \| history
lib/ext2fs/extent.c	patch \|	diff1 \|	diff2 \|	blob \| history
misc/mke2fs.c	patch \|	diff1 \|	diff2 \|	blob \| history
misc/tune2fs.c	patch \|	diff1 \|	diff2 \|	blob \| history