Merge branch 'maint' into next

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

Wed, 3 Dec 2014 03:15:25 +0000 (22:15 -0500)

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

Wed, 3 Dec 2014 03:15:25 +0000 (22:15 -0500)
author Theodore Ts'o <tytso@mit.edu>
Wed, 3 Dec 2014 03:15:25 +0000 (22:15 -0500)
committer Theodore Ts'o <tytso@mit.edu>
Wed, 3 Dec 2014 03:15:25 +0000 (22:15 -0500)
diff --cc lib/ext2fs/alloc_stats.c
Simple merge
diff --cc lib/ext2fs/bmap.c
Simple merge
diff --cc misc/dumpe2fs.c
Simple merge
diff --cc misc/mk_hugefiles.c
Simple merge
diff --cc misc/tune2fs.c
Simple merge
author	Theodore Ts'o <tytso@mit.edu>
	Wed, 3 Dec 2014 03:15:25 +0000 (22:15 -0500)
committer	Theodore Ts'o <tytso@mit.edu>
	Wed, 3 Dec 2014 03:15:25 +0000 (22:15 -0500)
		1	2
lib/ext2fs/alloc_stats.c	patch \|	diff1 \|	diff2 \|	blob \| history
lib/ext2fs/bmap.c	patch \|	diff1 \|	diff2 \|	blob \| history
misc/dumpe2fs.c	patch \|	diff1 \|	diff2 \|	blob \| history
misc/mk_hugefiles.c	patch \|	diff1 \|	diff2 \|	blob \| history
misc/tune2fs.c	patch \|	diff1 \|	diff2 \|	blob \| history