sugar/linux
1
0
Fork 0
Code Activity

[GFS2] Fix up merge of Linus' kernel into GFS2

Browse Source 
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
This commit is contained in:
Steven Whitehouse
2006-09-25 12:26:59 -04:00
parent 907b9bceb4 7c250413e5
commit 363e065c02
1897 changed files with 174595 additions and 66345 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
CREDITS
View File

@@ -2384,6 +2384,13 @@ N: Thomas Molina
E: tmolina@cablespeed.com
D: bug fixes, documentation, minor hackery
N: Paul Moore
E: paul.moore@hp.com
D: NetLabel author
S: Hewlett-Packard
S: 110 Spit Brook Road
S: Nashua, NH 03062
N: James Morris
E: jmorris@namei.org
W: http://namei.org/