]> git.ipfire.org Git - thirdparty/e2fsprogs.git/commit - misc/util.c
Merge branch 'maint' into next
authorTheodore Ts'o <tytso@mit.edu>
Wed, 10 Feb 2010 23:20:58 +0000 (18:20 -0500)
committerTheodore Ts'o <tytso@mit.edu>
Wed, 10 Feb 2010 23:20:58 +0000 (18:20 -0500)
commitcc84d866e2f29d92b5a732fead4df2dd9f814f2b
treea6df81da507c60d8253b436cf694ba03b6c9ee52
parent3067d96a2d226e2d1b6c97501be6aaa8e85140c3
parent9080695a4ec602b1102d836b44b18c2ec692c12e
Merge branch 'maint' into next

Conflicts:
e2fsck/pass1.c
e2fsck/pass1.c
misc/mke2fs.c
resize/resize2fs.c