]> git.ipfire.org Git - thirdparty/e2fsprogs.git/commit
Merge branch 'maint' into next
authorTheodore Ts'o <tytso@mit.edu>
Wed, 9 Jan 2013 02:14:25 +0000 (21:14 -0500)
committerTheodore Ts'o <tytso@mit.edu>
Wed, 9 Jan 2013 02:14:25 +0000 (21:14 -0500)
commitdf5e35fd63b42b66d5025fdca17bfdf6662a2827
treecff4ded8da39520af2f874f7236811925e62281d
parent827f45243acc16d3d98332db39d5b4eeadf33a0f
parentda489dd2f3287b644c792c4e7ffb530a8ae0b9a2
Merge branch 'maint' into next

Conflicts:
misc/mke2fs.c
e2fsck/unix.c
e2fsck/util.c
lib/ext2fs/openfs.c
misc/mke2fs.c