tree 0df0e65da403ade33ade580c2770c97437b1b1af
parent 907b9bceb41fa46beae93f79cc4a2247df502c0f
parent 7c250413e5b7c3dfae89354725b70c76d7621395
author Steven Whitehouse <swhiteho@redhat.com> 1159201619 -0400
committer Steven Whitehouse <swhiteho@redhat.com> 1159201619 -0400

[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