tree 282e61422ac7bba8cc19449d3da1555a273f4bbe
parent 493c82bb54397d2f46d2067bcedf966ea6da691f
parent df5d2e2b942bb263972fe30a4baafd68056e02bd
author Theodore Ts'o <tytso@mit.edu> 1339530796 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1339530796 -0700

am df5d2e2b: e2fsck: handle an already recovered journal with a non-zero s_error field

* commit 'df5d2e2b942bb263972fe30a4baafd68056e02bd':
  e2fsck: handle an already recovered journal with a non-zero s_error field