| commit | 254706056be7e4e161ae9675ead6cd4e269be966 | [log] [tgz] |
|---|---|---|
| author | Al Viro <viro@ZenIV.linux.org.uk> | Sun Jul 22 20:27:31 2012 -0400 |
| committer | Theodore Ts'o <tytso@mit.edu> | Sun Jul 22 20:27:31 2012 -0400 |
| tree | 12bc0bdb34ac8f908b2746dfbc7ada2eefeccd61 | |
| parent | 3108b54bcedde5d952c90460df5bc21efc1e134f [diff] |
ext4: fix ext4 mismerge back in January Duplicate caused, AFAICS, by mismerge in ff9cb1c4eead5e4c292e75cd3170a82d66944101> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> Cc: stable@vger.kernel.org