Whamcloud - gitweb
Merge branch 'maint' into next
authorTheodore Ts'o <tytso@mit.edu>
Thu, 23 Dec 2010 00:00:21 +0000 (19:00 -0500)
committerTheodore Ts'o <tytso@mit.edu>
Thu, 23 Dec 2010 00:00:21 +0000 (19:00 -0500)
Conflicts:
resize/resize2fs.c

1  2 
lib/ext2fs/dir_iterate.c
misc/mke2fs.c
resize/resize2fs.c

Simple merge
diff --cc misc/mke2fs.c
Simple merge
Simple merge