1
linux/fs/ext3
Jiri Kosina 318ae2edc3 Merge branch 'for-next' into for-linus
Conflicts:
	Documentation/filesystems/proc.txt
	arch/arm/mach-u300/include/mach/debug-macro.S
	drivers/net/qlge/qlge_ethtool.c
	drivers/net/qlge/qlge_main.c
	drivers/net/typhoon.c
2010-03-08 16:55:37 +01:00
..
acl.c sanitize xattr handler prototypes 2009-12-16 12:16:49 -05:00
acl.h ext[234]: move over to 'check_acl' permission model 2009-09-08 11:09:04 -07:00
balloc.c dquot: cleanup space allocation / freeing routines 2010-03-05 00:20:28 +01:00
bitmap.c
dir.c
ext3_jbd.c
file.c dquot: cleanup dquot initialize routine 2010-03-05 00:20:30 +01:00
fsync.c ext3: Wait for proper transaction commit on fsync 2009-11-11 15:22:49 +01:00
hash.c
ialloc.c dquot: cleanup dquot initialize routine 2010-03-05 00:20:30 +01:00
inode.c Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6 2010-03-05 13:20:53 -08:00
ioctl.c
Kconfig ext3: Update Kconfig description of EXT3_DEFAULTS_TO_ORDERED 2009-08-24 16:48:32 +02:00
Makefile
namei.c dquot: cleanup dquot initialize routine 2010-03-05 00:20:30 +01:00
namei.h
resize.c ext3: Replace lock/unlock_super() with an explicit lock for resizing 2009-12-23 13:44:12 +01:00
super.c Merge branch 'for-next' into for-linus 2010-03-08 16:55:37 +01:00
symlink.c
xattr_security.c sanitize xattr handler prototypes 2009-12-16 12:16:49 -05:00
xattr_trusted.c sanitize xattr handler prototypes 2009-12-16 12:16:49 -05:00
xattr_user.c sanitize xattr handler prototypes 2009-12-16 12:16:49 -05:00
xattr.c dquot: cleanup space allocation / freeing routines 2010-03-05 00:20:28 +01:00
xattr.h