OSDN Git Service

Merge tag 'v1.42.12' into next
authorTheodore Ts'o <tytso@mit.edu>
Fri, 29 Aug 2014 15:38:33 +0000 (11:38 -0400)
committerTheodore Ts'o <tytso@mit.edu>
Fri, 29 Aug 2014 15:38:33 +0000 (11:38 -0400)
commitb874d24629aa132d74a96134ec8eae4773a3c0ce
treea79927bcf2f325220253c341f6d3845e95b617fe
parentbf93a9685ea71db0a519e1df07c3ed850933034d
parent6a3741ad293031447b95b88431eafa77401a8987
Merge tag 'v1.42.12' into next

v1.42.12

Conflicts:
version.h
RELEASE-NOTES
debian/changelog
e2fsck/problem.c
misc/ext4.5.in
version.h