tree 4ba57a6ec31f3a4683e7766fbf4f182d459a8b51
parent 4a7cbb56fdbd92a47f57ca8b25bf5db35f0d6518
parent 46fe44ce8777f087aa8ad4a2605fdcfb9c2d63af
author Linus Torvalds <torvalds@linux-foundation.org> 1327435960 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1327435960 -0800

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/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