]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
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 Jan 2012 20:12:40 +0000 (12:12 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 24 Jan 2012 20:12:40 +0000 (12:12 -0800)
commitd2346963bfcbb9a8ee783ca3c3b3bdd7448ec9d5
tree4ba57a6ec31f3a4683e7766fbf4f182d459a8b51
parent4a7cbb56fdbd92a47f57ca8b25bf5db35f0d6518
parent46fe44ce8777f087aa8ad4a2605fdcfb9c2d63af
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