Linus Torvalds d28619f156 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6:
  quota: Convert quota statistics to generic percpu_counter
  ext3 uses rb_node = NULL; to zero rb_root.
  quota: Fixup dquot_transfer
  reiserfs: Fix resuming of quotas on remount read-write
  pohmelfs: Remove dead quota code
  ufs: Remove dead quota code
  udf: Remove dead quota code
  quota: rename default quotactl methods to dquot_
  quota: explicitly set ->dq_op and ->s_qcop
  quota: drop remount argument to ->quota_on and ->quota_off
  quota: move unmount handling into the filesystem
  quota: kill the vfs_dq_off and vfs_dq_quota_on_remount wrappers
  quota: move remount handling into the filesystem
  ocfs2: Fix use after free on remount read-only

Fix up conflicts in fs/ext4/super.c and fs/ufs/file.c
2010-05-30 09:11:11 -07:00
..
2010-05-27 22:05:02 -04:00
2006-10-02 09:55:27 -05:00
2008-05-13 08:22:10 -05:00
2010-04-23 02:08:44 +02:00
2008-06-10 15:12:58 -05:00
2006-10-02 09:55:27 -05:00
2009-06-24 08:17:04 -04:00
2007-04-26 07:30:29 -05:00
2006-10-02 09:55:27 -05:00
2006-10-02 09:55:27 -05:00
2009-12-17 11:03:25 -05:00
2009-01-09 15:42:04 -06:00
2006-10-02 09:55:27 -05:00
2006-10-02 09:55:27 -05:00
2006-10-02 09:55:27 -05:00
2009-01-09 15:42:04 -06:00
2009-02-02 13:43:28 -06:00
2006-02-09 09:09:16 -06:00
2010-04-16 08:05:50 -05:00