kernel-ark/drivers/staging/pohmelfs
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
..
config.c Staging: Use kmemdup 2010-05-17 16:31:15 -07:00
crypto.c Staging: pohmelfs: fix spaces and TAB coding style issue in crypto.c 2010-05-11 11:35:41 -07:00
dir.c Staging: pohmelfs: fix spaces and TAB coding style issue in dir.c 2010-05-11 11:35:41 -07:00
inode.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
Kconfig Staging: pohmelfs: fix kconfig dependencies 2009-04-03 14:53:36 -07:00
lock.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
Makefile Staging: pohmelfs: kconfig/makefile and vfs changes. 2009-04-03 14:53:36 -07:00
mcache.c Staging: pohmelfs: distributed locking and cache coherency protocol. 2009-04-03 14:53:34 -07:00
net.c Staging: pohmelfs: fix spaces and TAB coding style issue in net.c 2010-05-11 11:35:41 -07:00
netfs.h Staging: pohmelfs: fix spaces and TAB coding style issue in netfs.h 2010-05-11 11:35:41 -07:00
path_entry.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
trans.c Staging: pohmelfs: sync with the development tree 2009-09-15 12:02:30 -07:00