OSDN Git Service

Merge branch 'maint' into next
authorTheodore Ts'o <tytso@mit.edu>
Mon, 16 Nov 2009 05:30:57 +0000 (00:30 -0500)
committerTheodore Ts'o <tytso@mit.edu>
Mon, 16 Nov 2009 05:30:57 +0000 (00:30 -0500)
commit4486af5b4c1b117ac88a92cd2336cb41c15107d3
tree0f9f282be5d654bc2679b05072af3e7eb5035463
parent054e5a9ccf8d65e015f2af85bfddd3fda3a0472f
parent5827d2412d0774cb6294521a0ea578975fed07ce
Merge branch 'maint' into next

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