OSDN Git Service

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)
commitda2a5a4baede2a227d2da587eb74ceae66778fbc
tree5a2e070684ffc2f63873ee24a4b6a499ce9985e6
parent9b27e9cc320dd7da24356561b3b12c66f2540432
parent7267e3d3fdbc911477bfd7fb8bb5232252168d0a
Merge branch 'maint' into next

Conflicts:
resize/resize2fs.c
lib/ext2fs/dir_iterate.c
misc/mke2fs.c
resize/resize2fs.c