]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
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)
* '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


Trivial merge