tree 543f50d7f94611d7ebf75c7ac01c631c4943e0e8
parent 6961bc6c7055d0d1b2a670dbdca2c0165e267514
parent df4e7ac0bb70abc97fbfd9ef09671fc084b3f9db
author Linus Torvalds <torvalds@linux-foundation.org> 1387848278 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1387848278 -0800

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

Pull ext2 fix from Jan Kara:
 "One simple fix of oops in ext2 which was recently hit by Christoph"

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  ext2: Fix oops in ext2_get_block() called from ext2_quota_write()