lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7cf4c1a5fd
android_kernel_xiaomi_sm8350/fs/ocfs2
History
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
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 ocfs2: implement directory read-ahead 2006-09-20 15:53:40 -07:00
buffer_head_io.h ocfs2: implement directory read-ahead 2006-09-20 15:53:40 -07:00
dcache.c ocfs2: Remove special casing for inode creation in ocfs2_dentry_attach_lock() 2006-09-24 13:50:45 -07:00
dcache.h ocfs2: Remove special casing for inode creation in ocfs2_dentry_attach_lock() 2006-09-24 13:50:45 -07:00
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 ocfs2: silence -EEXIST from ocfs2_extent_map_insert/lookup 2006-06-29 15:52:56 -07:00
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 ocfs2: add ext2 attributes 2006-09-20 15:48:39 -07:00
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
Makefile ocfs2: add ext2 attributes 2006-09-20 15:48:39 -07: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_fs.h ocfs2: add ext2 attributes 2006-09-20 15:48:39 -07:00
ocfs2_lockid.h ocfs2: Add new cluster lock type 2006-09-24 13:50:42 -07:00
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
slot_map.c ocfs2: silence a debug print 2006-06-29 16:03:17 -07:00
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 ocfs2: use __attribute__ format 2006-03-24 14:58:24 -08:00
symlink.c ocfs2: update file system paths to set atime 2006-12-01 18:28:58 -08:00
symlink.h
sysfile.c ocfs2: Remove i_generation from inode lock names 2006-09-24 13:50:46 -07:00
sysfile.h
uptodate.c ocfs2: implement directory read-ahead 2006-09-20 15:53:40 -07:00
uptodate.h ocfs2: implement directory read-ahead 2006-09-20 15:53:40 -07:00
ver.c
ver.h
vote.c ocfs2: Remove the dentry vote 2006-09-24 13:50:43 -07:00
vote.h ocfs2: Remove the dentry vote 2006-09-24 13:50:43 -07:00