David S. Miller 7e452baf6b Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/message/fusion/mptlan.c drivers/net/sfc/ethtool.c net/mac80211/debugfs_sta.c		2008-11-11 15:43:02 -08:00
..
cluster	fs: replace NIPQUAD()	2008-10-31 00:56:28 -07:00
dlm
alloc.c
alloc.h
aops.c
aops.h
buffer_head_io.c	ocfs2: Make cached block reads the common case.	2008-10-14 11:58:22 -07:00
buffer_head_io.h	ocfs2: Make cached block reads the common case.	2008-10-14 11:58:22 -07:00
dcache.c
dcache.h
dir.c	ocfs2: Make cached block reads the common case.	2008-10-14 11:58:22 -07:00
dir.h
dlmglue.c
dlmglue.h
export.c	[PATCH] switch all filesystems over to d_obtain_alias	2008-10-23 05:13:01 -04:00
export.h
extent_map.c
extent_map.h
file.c	ocfs2: truncate outstanding block after direct io failure	2008-11-10 09:51:47 -08:00
file.h
heartbeat.c
heartbeat.h
inode.c	ocfs2: Set journal descriptor to NULL after journal shutdown	2008-11-10 09:51:47 -08:00
inode.h
ioctl.c
ioctl.h
journal.c	ocfs2: Set journal descriptor to NULL after journal shutdown	2008-11-10 09:51:47 -08:00
journal.h
localalloc.c	ocfs2: Make cached block reads the common case.	2008-10-14 11:58:22 -07:00
localalloc.h
locks.c
locks.h
Makefile
mmap.c	ocfs2: return 0 in page_mkwrite to let VFS retry.	2008-11-10 09:51:47 -08:00
mmap.h
namei.c	ocfs2: Let inode be really deleted when ocfs2_mknod_locked() fails	2008-11-10 09:51:46 -08:00
namei.h
ocfs1_fs_compat.h
ocfs2_fs.h	ocfs2: Fix some typos in xattr annotations.	2008-11-10 09:51:46 -08:00
ocfs2_jbd_compat.h
ocfs2_lockid.h
ocfs2_lockingver.h
ocfs2.h	ocfs2: Check xattr block signatures properly.	2008-11-10 09:51:44 -08:00
resize.c
resize.h
slot_map.c	ocfs2: Make cached block reads the common case.	2008-10-14 11:58:22 -07:00
slot_map.h
stack_o2cb.c
stack_user.c
stackglue.c
stackglue.h
suballoc.c
suballoc.h
super.c
super.h
symlink.c
symlink.h
sysfile.c
sysfile.h
uptodate.c
uptodate.h
ver.c
ver.h
xattr.c	ocfs2: Check search result in ocfs2_xattr_block_get()	2008-11-10 09:51:47 -08:00
xattr.h	ocfs2: fix function declaration and definition in xattr	2008-11-10 09:51:44 -08:00