2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-16 17:23:55 +08:00
linux-next/fs/configfs
Steven Whitehouse 363e065c02 [GFS2] Fix up merge of Linus' kernel into GFS2
This fixes up a couple of conflicts when merging up with
Linus' latest kernel. This will hopefully allow GFS2 to
be more easily merged into forthcoming -mm and FC kernels
due to the "one line per header" format now used for the
kernel headers.

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

Conflicts:

	include/linux/Kbuild
	include/linux/kernel.h
2006-09-25 12:26:59 -04:00
..
configfs_internal.h [PATCH] Make most file operations structs in fs/ const 2006-03-28 09:16:06 -08:00
dir.c configfs: Prevent duplicate subsystem names. 2006-09-20 15:46:14 -07:00
file.c [PATCH] Make most file operations structs in fs/ const 2006-03-28 09:16:06 -08:00
inode.c [PATCH] mark address_space_operations const 2006-06-28 14:59:04 -07:00
item.c [DLM] Export config_group_find_obj for use by the DLM 2006-01-18 14:21:40 +00:00
Makefile [PATCH] configfs: User-driven configuration filesystem 2006-01-03 11:45:28 -08:00
mount.c Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ 2006-06-24 13:07:53 -04:00
symlink.c configfs: Clear up a few extra spaces where there should be TABs. 2006-06-29 14:43:01 -07:00