Whamcloud - gitweb
Merge branch 'maint' into next
authorTheodore Ts'o <tytso@mit.edu>
Mon, 2 Jun 2014 01:49:21 +0000 (21:49 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Mon, 2 Jun 2014 01:49:21 +0000 (21:49 -0400)
1  2 
e2fsck/unix.c
misc/mke2fs.c

diff --cc e2fsck/unix.c
Simple merge
diff --cc misc/mke2fs.c
Simple merge