Whamcloud - gitweb
git://git.whamcloud.com / tools / e2fsprogs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d11736c e7d9ce9)
Merge branch 'maint'
authorTheodore Ts'o <tytso@mit.edu>
Sun, 27 Apr 2008 11:59:28 +0000 (07:59 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Sun, 27 Apr 2008 11:59:28 +0000 (07:59 -0400)
Conflicts:

tests/m_raid_opt/expect.1

1  2 
doc/libext2fs.texinfo patch | diff1 | diff2 | blob | history
misc/mke2fs.c patch | diff1 | diff2 | blob | history
tests/m_meta_bg/expect.1 patch | diff1 | diff2 | blob | history
tests/m_raid_opt/expect.1 patch | diff1 | diff2 | blob | history

diff --cc doc/libext2fs.texinfo
Simple merge
diff --cc misc/mke2fs.c
Simple merge
diff --cc tests/m_meta_bg/expect.1
Simple merge
diff --cc tests/m_raid_opt/expect.1
Simple merge
Mirror of git://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git