]> git.ipfire.org Git - thirdparty/e2fsprogs.git/commit
Merge branch 'maint' into next
authorTheodore Ts'o <tytso@mit.edu>
Tue, 1 Jan 2013 23:50:26 +0000 (18:50 -0500)
committerTheodore Ts'o <tytso@mit.edu>
Tue, 1 Jan 2013 23:50:26 +0000 (18:50 -0500)
commitb9b5e43ea81ecf575e3d96cbf51215aba3746b32
tree212b744b53c2277c504709d001511e4d92bd7429
parentab83252174bf450e865e76d7c7347c9c39fccadf
parent73c427d2a3f28c34280e51db76e580d9730c0cbf
Merge branch 'maint' into next

Conflicts:
RELEASE-NOTES
debian/changelog
lib/ext2fs/crc32c.c
lib/ext2fs/rw_bitmaps.c
resize/resize2fs.c
version.h
21 files changed:
RELEASE-NOTES
debian/changelog
debian/e2fslibs.symbols
debugfs/htree.c
e2fsck/pass1.c
e2fsck/problem.c
e2fsck/recovery.c
e2fsck/rehash.c
e2fsck/sigcatcher.c
e2fsck/unix.c
e2fsck/util.c
lib/ext2fs/blkmap64_rb.c
lib/ext2fs/crc32c.c
lib/ext2fs/csum.c
lib/ext2fs/dblist.c
lib/ext2fs/openfs.c
lib/ext2fs/rw_bitmaps.c
misc/mke2fs.c
misc/tune2fs.c
resize/resize2fs.c
version.h