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
2010-05-27 09:12:41 -07:00
2010-05-19 22:41:57 -04:00
2010-04-30 14:52:51 -05:00
2009-06-17 00:36:36 -04:00
2010-05-27 09:12:47 -07:00
2010-01-26 22:22:26 -05:00
2010-05-27 22:16:05 -04:00
2010-05-27 22:15:33 -04:00
2010-03-19 08:05:10 +01:00
2010-05-27 22:15:33 -04:00
2009-09-24 07:21:03 -07:00
2010-05-21 18:31:16 -04:00
2010-05-21 18:31:16 -04:00
2010-05-11 17:43:58 +02:00
2010-05-21 21:27:26 +02:00
2010-03-06 11:26:29 -08:00
2010-05-21 18:31:16 -04:00
2010-05-27 22:15:33 -04:00
2010-03-08 16:55:37 +01:00
2010-05-21 18:31:17 -04:00
2010-05-18 08:57:00 +10:00
2010-05-21 18:31:17 -04:00
2010-05-27 22:03:09 -04:00
2010-05-27 09:12:56 -07:00
2010-03-12 15:52:32 -08:00
2010-05-21 18:31:17 -04:00
2010-05-27 22:05:02 -04:00