Linus Torvalds 45e62974fb Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2 ... * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2: ocfs2/trivial: Use le16_to_cpu for a disk value in xattr.c ocfs2/trivial: Use proper mask for 2 places in hearbeat.c Ocfs2: Let ocfs2 support fiemap for symlink and fast symlink. Ocfs2: Should ocfs2 support fiemap for S_IFDIR inode? ocfs2: Use FIEMAP_EXTENT_SHARED fiemap: Add new extent flag FIEMAP_EXTENT_SHARED ocfs2: replace u8 by __u8 in ocfs2_fs.h ocfs2: explicit declare uninitialized var in user_cluster_connect() ocfs2-devel: remove redundant OCFS2_MOUNT_POSIX_ACL check in ocfs2_get_acl_nolock() ocfs2: return -EAGAIN instead of EAGAIN in dlm ocfs2/cluster: Make fence method configurable - v2 ocfs2: Set MS_POSIXACL on remount ocfs2: Make acl use the default ocfs2: Always include ACL support		2009-12-24 12:59:11 -08:00
..
cluster	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2	2009-12-24 12:59:11 -08:00
dlm	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2	2009-12-24 12:59:11 -08:00
acl.c	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2	2009-12-24 12:59:11 -08:00
acl.h	ocfs2: Always include ACL support	2009-10-28 23:05:57 -07:00
alloc.c	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2	2009-12-23 13:33:07 -08:00
alloc.h	ocfs2: Find proper end cpos for a leaf refcount block.	2009-12-02 16:14:57 -08:00
aops.c	cleanup blockdev_direct_IO locking	2009-12-16 12:16:49 -05:00
aops.h
blockcheck.c	tree-wide: fix typos "offest" -> "offset"	2009-12-04 15:39:50 +01:00
blockcheck.h
buffer_head_io.c
buffer_head_io.h
dcache.c
dcache.h
dir.c
dir.h
dlmglue.c	tree-wide: fix assorted typos all over the place	2009-12-04 15:39:55 +01:00
dlmglue.h
export.c
export.h
extent_map.c	Ocfs2: Let ocfs2 support fiemap for symlink and fast symlink.	2009-12-23 17:52:09 -08:00
extent_map.h
file.c	vfs: Implement proper O_SYNC semantics	2009-12-10 15:02:50 +01:00
file.h
heartbeat.c
heartbeat.h
inode.c
inode.h
ioctl.c
ioctl.h
journal.c	tree-wide: fix assorted typos all over the place	2009-12-04 15:39:55 +01:00
journal.h
Kconfig	ocfs2: Always include ACL support	2009-10-28 23:05:57 -07:00
localalloc.c
localalloc.h
locks.c
locks.h
Makefile	ocfs2: Always include ACL support	2009-10-28 23:05:57 -07:00
mmap.c
mmap.h
namei.c	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2	2009-12-24 12:59:11 -08:00
namei.h
ocfs1_fs_compat.h
ocfs2_fs.h	ocfs2: replace u8 by __u8 in ocfs2_fs.h	2009-12-17 20:55:54 -08:00
ocfs2_lockid.h
ocfs2_lockingver.h
ocfs2.h	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2	2009-12-24 12:59:11 -08:00
quota_global.c
quota_local.c	const: struct quota_format_ops	2009-12-10 15:02:51 +01:00
quota.h	quota: Move definition of QFMT_OCFS2 to linux/quota.h	2009-12-10 15:02:53 +01:00
refcounttree.c	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2	2009-12-23 13:33:07 -08:00
refcounttree.h
resize.c
resize.h
slot_map.c
slot_map.h
stack_o2cb.c
stack_user.c	ocfs2: explicit declare uninitialized var in user_cluster_connect()	2009-12-17 20:55:52 -08:00
stackglue.c	sysctl: Drop & in front of every proc_handler.	2009-11-18 08:37:40 -08:00
stackglue.h
suballoc.c
suballoc.h
super.c	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2	2009-12-24 12:59:11 -08:00
super.h
symlink.c	Ocfs2: Let ocfs2 support fiemap for symlink and fast symlink.	2009-12-23 17:52:09 -08:00
symlink.h
sysfile.c
sysfile.h
uptodate.c	ocfs2: Trivial cleanup of jbd compatibility layer removal	2009-11-13 15:45:05 -08:00
uptodate.h
ver.c
ver.h
xattr.c	Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2	2009-12-24 12:59:11 -08:00
xattr.h	ocfs2: Always include ACL support	2009-10-28 23:05:57 -07:00