OSDN Git Service

Merge branch 'maint' into next
authorTheodore Ts'o <tytso@mit.edu>
Mon, 28 Feb 2011 00:47:44 +0000 (19:47 -0500)
committerTheodore Ts'o <tytso@mit.edu>
Mon, 28 Feb 2011 00:47:44 +0000 (19:47 -0500)
commit829d9994880394e48c883510799b1536812d6efb
treee21afba233d49f4fcf600bd6b632610297e70368
parent7d9e31655fca48e9d6c2647ad443124113508b73
parent412376efff3c0e0c2fea00666c2457e6f2ae1878
Merge branch 'maint' into next

Conflicts:
lib/ext2fs/initialize.c
debugfs/set_fields.c
e2fsck/message.c
e2fsck/super.c
lib/e2p/ls.c
lib/ext2fs/ext2_fs.h
lib/ext2fs/ext2fs.h
lib/ext2fs/initialize.c
lib/ext2fs/openfs.c
lib/ext2fs/swapfs.c
misc/mke2fs.c