Whamcloud - gitweb
Merge branch 'maint' into next
authorTheodore Ts'o <tytso@mit.edu>
Mon, 25 Aug 2014 22:37:37 +0000 (18:37 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Mon, 25 Aug 2014 22:37:37 +0000 (18:37 -0400)
commitc1c8800b71521959b0ea3e8e385ed9e01f902612
tree4ae111d62e774748544468b3ba554605c7f3f91f
parentd9eab8e2f080bd21d6fbea4c924a6388a4811f5c
parent6b319481d9b8b1f5d415aee60d1a95321ddf023d
Merge branch 'maint' into next

Conflicts:
RELEASE-NOTES
debian/changelog
version.h
RELEASE-NOTES
debian/changelog
debian/e2fslibs.symbols
debugfs/set_fields.c
misc/dumpe2fs.c
misc/mke2fs.8.in
misc/mke2fs.c
tests/r_inline_xattr/expect
version.h