Merge branch 'maint' into next

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

Fri, 19 Sep 2014 01:28:59 +0000 (21:28 -0400)

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

Fri, 19 Sep 2014 01:28:59 +0000 (21:28 -0400)
author Theodore Ts'o <tytso@mit.edu>
Fri, 19 Sep 2014 01:28:59 +0000 (21:28 -0400)
committer Theodore Ts'o <tytso@mit.edu>
Fri, 19 Sep 2014 01:28:59 +0000 (21:28 -0400)
diff --cc configure
Simple merge
diff --cc configure.in
Simple merge
diff --cc lib/ext2fs/mkjournal.c
Simple merge
diff --cc misc/tune2fs.c
Simple merge
author	Theodore Ts'o <tytso@mit.edu>
	Fri, 19 Sep 2014 01:28:59 +0000 (21:28 -0400)
committer	Theodore Ts'o <tytso@mit.edu>
	Fri, 19 Sep 2014 01:28:59 +0000 (21:28 -0400)
		1	2
configure	patch \|	diff1 \|	diff2 \|	blob \| history
configure.in	patch \|	diff1 \|	diff2 \|	blob \| history
lib/ext2fs/mkjournal.c	patch \|	diff1 \|	diff2 \|	blob \| history
misc/tune2fs.c	patch \|	diff1 \|	diff2 \|	blob \| history