linux

mirror of https://github.com/FEX-Emu/linux.git synced 2025-01-23 02:47:06 +00:00

History

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

…

dir.c

configfs: Prevent duplicate subsystem names.

2006-09-20 15:46:14 -07:00

file.c

…

inode.c

[PATCH] mark address_space_operations const

2006-06-28 14:59:04 -07:00

item.c