From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 24 Jan 2012 20:12:40 +0000 (-0800)
Subject: Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
X-Git-Tag: firefly_0821_release~3680^2~3641
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=d2346963bfcbb9a8ee783ca3c3b3bdd7448ec9d5;p=firefly-linux-kernel-4.4.55.git

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

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  quota: Pass information that quota is stored in system file to userspace
  ext2: protect inode changes in the SETVERSION and SETFLAGS ioctls
  jbd: Issue cache flush after checkpointing
---

d2346963bfcbb9a8ee783ca3c3b3bdd7448ec9d5