From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 24 Dec 2013 01:24:38 +0000 (-0800)
Subject: Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
X-Git-Tag: v4.0~2688
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dc0a6b4fee04f99a3db3dd5affcce440dc0c4b7e;p=platform%2Fkernel%2Flinux-amlogic.git

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()
---

dc0a6b4fee04f99a3db3dd5affcce440dc0c4b7e