kernel_optimize_test/fs/ufs
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
..
balloc.c ufs: Remove dead quota code 2010-05-24 14:10:19 +02:00
cylinder.c
dir.c rename the generic fsync implementations 2010-05-27 22:06:06 -04:00
file.c Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6 2010-05-30 09:11:11 -07:00
ialloc.c ufs: Remove dead quota code 2010-05-24 14:10:19 +02:00
inode.c ufs: Remove dead quota code 2010-05-24 14:10:19 +02:00
Kconfig fs/Kconfig: move ufs out 2009-01-22 13:16:00 +03:00
Makefile
namei.c ufs: Remove dead quota code 2010-05-24 14:10:19 +02:00
super.c Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6 2010-05-30 09:11:11 -07:00
swab.h ufs: replace __inline with inline 2008-04-28 08:58:45 -07:00
symlink.c ufs: add ufs speciffic ->setattr call 2010-05-21 19:30:40 +02:00
truncate.c Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6 2010-05-30 09:11:11 -07:00
ufs_fs.h ufs: permit mounting of BorderWare filesystems 2010-05-27 09:12:43 -07:00
ufs.h ufs: add ufs speciffic ->setattr call 2010-05-21 19:30:40 +02:00
util.c
util.h