Merge branch 'maint' into next

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

Thu, 23 Dec 2010 00:00:21 +0000 (19:00 -0500)

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

Thu, 23 Dec 2010 00:00:21 +0000 (19:00 -0500)
author Theodore Ts'o <tytso@mit.edu>
Thu, 23 Dec 2010 00:00:21 +0000 (19:00 -0500)
committer Theodore Ts'o <tytso@mit.edu>
Thu, 23 Dec 2010 00:00:21 +0000 (19:00 -0500)
diff --cc lib/ext2fs/dir_iterate.c
Simple merge
diff --cc misc/mke2fs.c
Simple merge
diff --cc resize/resize2fs.c
Simple merge
author	Theodore Ts'o <tytso@mit.edu>
	Thu, 23 Dec 2010 00:00:21 +0000 (19:00 -0500)
committer	Theodore Ts'o <tytso@mit.edu>
	Thu, 23 Dec 2010 00:00:21 +0000 (19:00 -0500)
		1	2
lib/ext2fs/dir_iterate.c	patch \|	diff1 \|	diff2 \|	blob \| history
misc/mke2fs.c	patch \|	diff1 \|	diff2 \|	blob \| history
resize/resize2fs.c	patch \|	diff1 \|	diff2 \|	blob \| history