OSDN Git Service

Merge basic FLEX_BG support
authorTheodore Ts'o <tytso@mit.edu>
Sun, 4 Nov 2007 01:01:01 +0000 (21:01 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Sun, 4 Nov 2007 01:01:01 +0000 (21:01 -0400)
Merge commit 'c2d4300b8a4a13d8a78b86c386f76259f23feec2' into next

1  2 
lib/ext2fs/ext2_fs.h
misc/mke2fs.c

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