Merge branch 'maint' into next

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

Mon, 22 Apr 2013 04:07:08 +0000 (00:07 -0400)

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

Mon, 22 Apr 2013 04:07:08 +0000 (00:07 -0400)
author Theodore Ts'o <tytso@mit.edu>
Mon, 22 Apr 2013 04:07:08 +0000 (00:07 -0400)
committer Theodore Ts'o <tytso@mit.edu>
Mon, 22 Apr 2013 04:07:08 +0000 (00:07 -0400)
diff --cc lib/ext2fs/inode.c
Simple merge
diff --cc misc/mke2fs.c
Simple merge
diff --cc misc/tune2fs.c
Simple merge
diff --cc resize/resize2fs.c
Simple merge
author	Theodore Ts'o <tytso@mit.edu>
	Mon, 22 Apr 2013 04:07:08 +0000 (00:07 -0400)
committer	Theodore Ts'o <tytso@mit.edu>
	Mon, 22 Apr 2013 04:07:08 +0000 (00:07 -0400)
		1	2
lib/ext2fs/inode.c	patch \|	diff1 \|	diff2 \|	blob \| history
misc/mke2fs.c	patch \|	diff1 \|	diff2 \|	blob \| history
misc/tune2fs.c	patch \|	diff1 \|	diff2 \|	blob \| history
resize/resize2fs.c	patch \|	diff1 \|	diff2 \|	blob \| history