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
..
2006-08-14 12:54:28 -07:00
2006-08-06 08:57:48 -07:00
2006-09-25 09:26:04 -04:00
2006-09-25 09:26:04 -04:00
2006-09-01 11:39:10 -07:00
2006-08-27 11:01:30 -07:00
2006-08-27 11:01:31 -07:00
2006-06-26 18:35:02 +02:00
2006-01-11 18:42:13 -08:00
2006-01-10 08:01:25 -08:00
2005-04-16 15:20:36 -07:00
2005-04-16 15:20:36 -07:00
2006-07-31 13:28:38 -07:00
2006-09-22 23:24:30 -04:00
2006-01-08 20:12:40 -08:00
2006-08-27 11:01:31 -07:00
2006-04-02 13:37:19 +02:00
2006-04-11 13:53:33 +02:00
2006-07-12 12:52:55 -07:00
2005-10-30 17:37:32 -08:00
2006-08-21 10:02:50 +02:00
2006-06-26 09:58:17 -07:00
2006-08-14 13:10:59 -07:00
2006-03-28 09:16:08 -08:00
2006-06-23 07:42:49 -07:00
2006-06-26 09:58:17 -07:00
2005-11-07 18:18:11 -08:00
2005-04-16 15:20:36 -07:00
2006-03-23 07:38:11 -08:00
2006-03-23 07:38:11 -08:00
2006-03-23 07:38:12 -08:00
2006-06-23 07:42:49 -07:00
2005-04-16 15:20:36 -07:00