OSDN Git Service

Merge branch 'maint' into next
authorTheodore Ts'o <tytso@mit.edu>
Fri, 8 Aug 2014 21:02:34 +0000 (17:02 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Fri, 8 Aug 2014 21:02:34 +0000 (17:02 -0400)
commit489ff4a2c7acfe4bbfdf14a68a674933a54e1632
tree26f77b45748e31f9bd5c5d091d6550f95a653156
parentc83b20ef65fea46fdf4431ea98d81c8c985fdd59
parentf00948ad1df100c7d616ef6fbf7609329a2e4001
Merge branch 'maint' into next

Conflicts:
configure
configure
configure.in
debugfs/debugfs.8.in
debugfs/dump.c
lib/config.h.in
lib/ext2fs/alloc_tables.c
lib/ext2fs/initialize.c