Whamcloud - gitweb
git://git.whamcloud.com / tools / e2fsprogs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f52c175 f6243c1)
Merge branch 'master' of https://github.com/danielnorberg/e2fsprogs into maint
authorTheodore Ts'o <tytso@mit.edu>
Tue, 10 Apr 2012 17:10:44 +0000 (13:10 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Tue, 10 Apr 2012 17:16:29 +0000 (13:16 -0400)
(The single commit was missing a Signed-Off-By, but it was a trivial
change to a non-source file, so I've accepted it.)

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

Trivial merge
Mirror of git://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git