]> git.ipfire.org Git - thirdparty/e2fsprogs.git/commit - e2fsck/pass2.c
Merge branch 'maint' into next
authorTheodore Ts'o <tytso@mit.edu>
Mon, 7 Jun 2010 16:42:40 +0000 (12:42 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Mon, 7 Jun 2010 16:42:40 +0000 (12:42 -0400)
commit97d26ce9e3589e9f5fa17014467a9730a884d158
tree1321a9170832aebc6c5017a70d6d73957cf31ba4
parentc561e751a17c85b898d74f8cc16daad5f29500a4
parent296b9d696ab491f29d6d2083982e39b0ff3dab1f
Merge branch 'maint' into next

Conflicts:
e2fsck/journal.c
e2fsck/pass1.c
e2fsck/pass2.c
misc/mke2fs.c
57 files changed:
configure
configure.in
e2fsck/Makefile.in
e2fsck/journal.c
e2fsck/pass1.c
e2fsck/pass2.c
e2fsck/super.c
e2fsck/unix.c
lib/e2p/e2p.h
lib/e2p/ls.c
lib/e2p/parse_num.c
lib/ext2fs/Makefile.in
lib/ext2fs/alloc.c
lib/ext2fs/alloc_sb.c
lib/ext2fs/alloc_stats.c
lib/ext2fs/alloc_tables.c
lib/ext2fs/bb_inode.c
lib/ext2fs/bitmaps.c
lib/ext2fs/bitops.c
lib/ext2fs/bitops.h
lib/ext2fs/block.c
lib/ext2fs/bmove.c
lib/ext2fs/check_desc.c
lib/ext2fs/closefs.c
lib/ext2fs/csum.c
lib/ext2fs/dblist.c
lib/ext2fs/dirblock.c
lib/ext2fs/expanddir.c
lib/ext2fs/ext2_fs.h
lib/ext2fs/ext2_io.h
lib/ext2fs/ext2fs.h
lib/ext2fs/ext2fsP.h
lib/ext2fs/ext_attr.c
lib/ext2fs/extent.c
lib/ext2fs/fiemap.h
lib/ext2fs/fileio.c
lib/ext2fs/gen_bitmap.c
lib/ext2fs/icount.c
lib/ext2fs/imager.c
lib/ext2fs/initialize.c
lib/ext2fs/inode.c
lib/ext2fs/mkdir.c
lib/ext2fs/mkjournal.c
lib/ext2fs/openfs.c
lib/ext2fs/rw_bitmaps.c
lib/ext2fs/swapfs.c
lib/ext2fs/tst_badblocks.c
lib/ext2fs/tst_bitops.c
lib/ext2fs/tst_iscan.c
lib/ext2fs/undo_io.c
lib/ext2fs/valid_blk.c
misc/Makefile.in
misc/mke2fs.c
misc/tune2fs.c
misc/util.c
resize/main.c
tests/f_bad_disconnected_inode/expect.1