Whamcloud - gitweb
Merge branch 'maint' into next
authorTheodore Ts'o <tytso@mit.edu>
Thu, 6 Feb 2014 20:39:28 +0000 (15:39 -0500)
committerTheodore Ts'o <tytso@mit.edu>
Thu, 6 Feb 2014 20:39:28 +0000 (15:39 -0500)
1  2 
configure
configure.in
lib/ext2fs/extent.c
misc/mke2fs.c
misc/tune2fs.c

diff --cc configure
Simple merge
diff --cc configure.in
Simple merge
Simple merge
diff --cc misc/mke2fs.c
Simple merge
diff --cc misc/tune2fs.c
Simple merge