Whamcloud - gitweb
Merge branch 'cl/remove-masix' into next
authorTheodore Ts'o <tytso@mit.edu>
Thu, 1 Nov 2007 05:54:22 +0000 (01:54 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Thu, 1 Nov 2007 05:54:22 +0000 (01:54 -0400)
1  2 
debugfs/debugfs.c
e2fsck/pass1.c

Simple merge
diff --cc e2fsck/pass1.c
Simple merge