Whamcloud - gitweb
Merge branch 'maint' into next
authorTheodore Ts'o <tytso@mit.edu>
Sat, 25 Sep 2010 02:40:21 +0000 (22:40 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Sat, 25 Sep 2010 02:40:21 +0000 (22:40 -0400)
commit9d92a201deec7bbb1911e6e5ee98abf3c83882d4
treed5ee9d5e7d638a2bcf1037363a6109cdfbc61421
parentccc7cf032852dd5c84b227bafb481b1d158e2b5e
parent73fbe2323af6a2b4d807c80069657bf1449b3bff
Merge branch 'maint' into next

Conflicts:
configure
configure.in
lib/ext2fs/ext2fs.h
misc/mke2fs.c
17 files changed:
configure
configure.in
debugfs/debugfs.8.in
debugfs/debugfs.c
debugfs/set_fields.c
e2fsck/unix.c
lib/e2p/ls.c
lib/ext2fs/closefs.c
lib/ext2fs/ext2_fs.h
lib/ext2fs/ext2_io.h
lib/ext2fs/ext2fs.h
lib/ext2fs/inode.c
lib/ext2fs/openfs.c
lib/ext2fs/rw_bitmaps.c
misc/badblocks.c
misc/mke2fs.c
misc/tune2fs.c