David Howells 9db7372445 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 ... Conflicts: drivers/ata/libata-scsi.c include/linux/libata.h Futher merge of Linus's head and compilation fixups. Signed-Off-By: David Howells <dhowells@redhat.com>		2006-12-05 17:01:28 +00:00
..
cluster	WorkStruct: make allyesconfig	2006-11-22 14:57:56 +00:00
dlm	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6	2006-12-05 17:01:28 +00:00
Makefile	…
alloc.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6	2006-12-05 17:01:28 +00:00
alloc.h	ocfs2: Remove struct ocfs2_journal_handle in favor of handle_t	2006-12-01 18:28:28 -08:00
aops.c	ocfs2: Remove struct ocfs2_journal_handle in favor of handle_t	2006-12-01 18:28:28 -08:00
aops.h	ocfs2: Remove struct ocfs2_journal_handle in favor of handle_t	2006-12-01 18:28:28 -08:00
buffer_head_io.c	…
buffer_head_io.h	…
dcache.c	…
dcache.h	…
dir.c	ocfs2: update file system paths to set atime	2006-12-01 18:28:58 -08:00
dir.h	ocfs2: Remove struct ocfs2_journal_handle in favor of handle_t	2006-12-01 18:28:28 -08:00
dlmglue.c	ocfs2: core atime update functions	2006-12-01 18:28:51 -08:00
dlmglue.h	ocfs2: core atime update functions	2006-12-01 18:28:51 -08:00
endian.h	…
export.c	ocfs2: remove unused handle argument from ocfs2_meta_lock_full()	2006-12-01 18:28:05 -08:00
export.h	…
extent_map.c	…
extent_map.h	…
file.c	ocfs2: implement i_op->permission	2006-12-01 18:29:14 -08:00
file.h	ocfs2: implement i_op->permission	2006-12-01 18:29:14 -08:00
heartbeat.c	…
heartbeat.h	…
inode.c	ocfs2: core atime update functions	2006-12-01 18:28:51 -08:00
inode.h	ocfs2: Remove struct ocfs2_journal_handle in favor of handle_t	2006-12-01 18:28:28 -08:00
ioctl.c	ocfs2: Remove struct ocfs2_journal_handle in favor of handle_t	2006-12-01 18:28:28 -08:00
ioctl.h	…
journal.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6	2006-12-05 17:01:28 +00:00
journal.h	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6	2006-12-05 17:01:28 +00:00
localalloc.c	ocfs2: Remove struct ocfs2_journal_handle in favor of handle_t	2006-12-01 18:28:28 -08:00
localalloc.h	ocfs2: Remove struct ocfs2_journal_handle in favor of handle_t	2006-12-01 18:28:28 -08:00
mmap.c	ocfs2: update file system paths to set atime	2006-12-01 18:28:58 -08:00
mmap.h	…
namei.c	ocfs2: implement i_op->permission	2006-12-01 18:29:14 -08:00
namei.h	ocfs2: Remove struct ocfs2_journal_handle in favor of handle_t	2006-12-01 18:28:28 -08:00
ocfs1_fs_compat.h	…
ocfs2.h	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6	2006-12-05 17:01:28 +00:00
ocfs2_fs.h	…
ocfs2_lockid.h	…
slot_map.c	…
slot_map.h	…
suballoc.c	ocfs2: Remove struct ocfs2_journal_handle in favor of handle_t	2006-12-01 18:28:28 -08:00
suballoc.h	ocfs2: Remove struct ocfs2_journal_handle in favor of handle_t	2006-12-01 18:28:28 -08:00
super.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6	2006-12-05 17:01:28 +00:00
super.h	…
symlink.c	ocfs2: update file system paths to set atime	2006-12-01 18:28:58 -08:00
symlink.h	…
sysfile.c	…
sysfile.h	…
uptodate.c	…
uptodate.h	…
ver.c	…
ver.h	…
vote.c	…
vote.h	…