OSDN Git Service

Merge branch 'maint' into next
authorTheodore Ts'o <tytso@mit.edu>
Mon, 17 Sep 2012 02:06:29 +0000 (22:06 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Mon, 17 Sep 2012 02:06:29 +0000 (22:06 -0400)
commit32dd6cdbe533f77dbcf05fe706cb60a95c464cd7
tree13c03acc6cee97a509f874ebf6b25d6082a282aa
parent0e7e7c8ef89cf32fdb1210bfde1feb90880c327b
parent12f48b0caa366e7a02ac8ad57af4ecf0b8bb3778
Merge branch 'maint' into next

Conflicts:
resize/resize2fs.c
misc/mke2fs.c
resize/resize2fs.c
tests/f_mmp/script