Merge branch 'maint' into next

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

Tue, 30 May 2017 00:43:01 +0000 (20:43 -0400)

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

Tue, 30 May 2017 00:43:01 +0000 (20:43 -0400)
author Theodore Ts'o <tytso@mit.edu>
Tue, 30 May 2017 00:43:01 +0000 (20:43 -0400)
committer Theodore Ts'o <tytso@mit.edu>
Tue, 30 May 2017 00:43:01 +0000 (20:43 -0400)
diff --cc misc/mke2fs.c
Simple merge
diff --cc misc/tune2fs.c
Simple merge
author	Theodore Ts'o <tytso@mit.edu>
	Tue, 30 May 2017 00:43:01 +0000 (20:43 -0400)
committer	Theodore Ts'o <tytso@mit.edu>
	Tue, 30 May 2017 00:43:01 +0000 (20:43 -0400)
		1	2
misc/mke2fs.c	patch \|	diff1 \|	diff2 \|	blob \| history
misc/tune2fs.c	patch \|	diff1 \|	diff2 \|	blob \| history