tree 215cb869296c7fed7cb4d75a31a9257241ec9d06
parent b10cb70d3c40e5cefc80e9e5fd9c8f8dfb18b0d8
parent 0a02698f2851f419aa75536afb5f040a5c9ce002
author Theodore Ts'o <tytso@mit.edu> 1339537948 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1339537948 -0700

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

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