Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 24 Dec 2013 01:24:38 +0000 (17:24 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 24 Dec 2013 01:24:38 +0000 (17:24 -0800)
commitdc0a6b4fee04f99a3db3dd5affcce440dc0c4b7e
tree543f50d7f94611d7ebf75c7ac01c631c4943e0e8
parent6961bc6c7055d0d1b2a670dbdca2c0165e267514
parentdf4e7ac0bb70abc97fbfd9ef09671fc084b3f9db
Merge branch 'for_linus' of git://git./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()