Merge branch 'maint' into next

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

Sat, 11 Jan 2014 04:26:00 +0000 (23:26 -0500)

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

Sat, 11 Jan 2014 04:26:00 +0000 (23:26 -0500)
author Theodore Ts'o <tytso@mit.edu>
Sat, 11 Jan 2014 04:26:00 +0000 (23:26 -0500)
committer Theodore Ts'o <tytso@mit.edu>
Sat, 11 Jan 2014 04:26:00 +0000 (23:26 -0500)
diff --cc misc/mke2fs.c
Simple merge
diff --cc misc/tune2fs.c
Simple merge
author	Theodore Ts'o <tytso@mit.edu>
	Sat, 11 Jan 2014 04:26:00 +0000 (23:26 -0500)
committer	Theodore Ts'o <tytso@mit.edu>
	Sat, 11 Jan 2014 04:26:00 +0000 (23:26 -0500)
		1	2
misc/mke2fs.c	patch \|	diff1 \|	diff2 \|	blob \| history
misc/tune2fs.c	patch \|	diff1 \|	diff2 \|	blob \| history