From: Steven Whitehouse <swhiteho@redhat.com>
Date: Mon, 25 Sep 2006 16:26:59 +0000 (-0400)
Subject: [GFS2] Fix up merge of Linus' kernel into GFS2
X-Git-Tag: v2.6.19-rc1~32^2~20
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=363e065c02b1273364d5356711a83e7f548fc0c8;p=pandora-kernel.git

[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
---

363e065c02b1273364d5356711a83e7f548fc0c8
Reading git-diff-tree failed