tree 5b4c2d40fa115ca1296b3361b27958ad371f1f64
parent f67550728914cb76896ef58d833dd68b4c6d5048
parent 5886dc5cdcccd3d09a208d41d8c23748c25a2a22
author Theodore Ts'o <tytso@mit.edu> 1339537949 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1339537949 -0700

am 5886dc5c: am fada3660: e2fsck: correctly propagate error from journal to superblock

* commit '5886dc5cdcccd3d09a208d41d8c23748c25a2a22':
  e2fsck: correctly propagate error from journal to superblock