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

..

acpi

…

asm-alpha

Merge branch 'master' into upstream

2006-09-24 01:52:47 -04:00

asm-arm

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2006-09-24 22:05:59 +01:00

asm-arm26

Remove ARM26 header export.

2006-09-21 08:54:44 +01:00

asm-cris

Clean up exported headers on CRIS

2006-09-21 09:33:55 +01:00

asm-frv

[PATCH] restore libata build on frv

2006-09-24 15:55:03 -07:00

asm-generic

Merge branch 'master' into upstream

2006-09-24 01:52:47 -04:00

asm-h8300

Fix H8300 exported headers.

2006-09-21 08:51:43 +01:00

asm-i386

Merge branch 'master' into upstream

2006-09-24 01:52:47 -04:00

asm-ia64

Merge branch 'master' into upstream

2006-09-24 01:52:47 -04:00

asm-m32r

Fix 'make headers_check' on m32r

2006-09-21 08:41:35 +01:00

asm-m68k

[PATCH] Fix 'make headers_check' on ia64

2006-09-19 07:59:59 -07:00

asm-m68knommu

Fix m68knommu exported headers

2006-09-21 08:50:36 +01:00

asm-mips

[PATCH] headers_check: fix userspace build of asm-mips/page.h

2006-09-13 07:32:16 -07:00

asm-parisc

[PATCH] headers_check: Clean up asm-parisc/page.h for user headers

2006-09-19 07:59:59 -07:00

asm-powerpc

Merge branch 'master' into upstream

2006-09-24 01:52:47 -04:00

asm-ppc

[PATCH] #elif that should've been #elif defined

2006-09-23 11:34:43 -07:00

asm-s390

[S390] Unexport <asm/z90crypt.h>, export <asm/zcrypt.h> in its place.

2006-09-24 22:07:25 +01:00

asm-sh

Fix 'make headers_check' on sh

2006-09-21 08:36:50 +01:00

asm-sh64

Fix 'make headers_check' on sh64

2006-09-21 08:37:10 +01:00

asm-sparc

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2006-09-24 22:05:59 +01:00

asm-sparc64

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2006-09-24 22:05:59 +01:00

asm-um

Remove UML header export

2006-09-21 08:55:28 +01:00

asm-v850

Fix v850 exported headers

2006-09-21 09:05:25 +01:00

asm-x86_64

Merge branch 'master' into upstream

2006-09-24 01:52:47 -04:00

asm-xtensa

[PATCH] remove set_wmb - arch removal

2006-07-14 21:56:14 -07:00

crypto

[CRYPTO] digest: Added user API for new hash type

2006-09-21 11:46:17 +10:00

keys

…

linux

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

2006-09-25 12:26:59 -04:00

math-emu

…

media

V4L/DVB (4605): Fixes an issue with V4L1 and make headers-install

2006-09-10 13:45:55 -03:00

mtd

Merge git://git.infradead.org/~dwmw2/hdroneline

2006-09-22 12:56:22 -07:00

net

[PATCH] netlabel gfp annotations

2006-09-24 15:55:03 -07:00

pcmcia

…

rdma

IB/sa: fix ib_sa_selector names

2006-09-22 15:22:55 -07:00

rxrpc

…

scsi

[PATCH] SCSI gfp_t annotations

2006-09-24 20:07:49 -07:00

sound

[ALSA] ak4xxx - Remove bogus IPGA controls

2006-09-23 10:46:55 +02:00

video

[HEADERS] One line per header in Kbuild files to reduce conflicts

2006-09-19 12:43:58 +01:00

Kbuild

[HEADERS] One line per header in Kbuild files to reduce conflicts

2006-09-19 12:43:58 +01:00