H. Peter Anvin 48b1fddbb1 Merge branch 'irq/numa' into x86/mce3 ...

Merge reason: arch/x86/kernel/irqinit_{32,64}.c unified in irq/numa
and modified in x86/mce3; this merge resolves the conflict.

Conflicts:
	arch/x86/kernel/irqinit.c

Signed-off-by: H. Peter Anvin <hpa@zytor.com>

2009-06-01 15:25:31 -07:00

..

alpha

Merge branch 'linus' into irq/numa

2009-06-01 21:06:21 +02:00

arm

Merge branch 'linus' into irq/numa

2009-06-01 21:06:21 +02:00

avr32

avr32: drop unused CLEAN_FILES

2009-05-01 10:54:00 +02:00

blackfin

flat: fix data sections alignment

2009-05-29 08:40:02 -07:00

cris

Merge branch 'linus' into irq/numa

2009-06-01 21:06:21 +02:00

frv

FRV: Use __INIT macro instead of .text.init.

2009-04-27 19:46:30 -07:00

h8300

flat: fix data sections alignment

2009-05-29 08:40:02 -07:00

ia64

Merge branch 'x86/apic' into irq/numa

2009-05-12 12:17:36 +02:00

m32r

flat: fix data sections alignment

2009-05-29 08:40:02 -07:00

m68k

flat: fix data sections alignment

2009-05-29 08:40:02 -07:00

m68knommu

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

2009-04-24 08:45:53 -07:00

microblaze

microblaze: Fix kind-of-intr checking against number of interrupts

2009-05-18 14:47:42 +02:00

mips

Merge branch 'linus' into irq/numa

2009-06-01 21:06:21 +02:00

mn10300

mn10300: convert to use __HEAD and HEAD_TEXT macros.

2009-04-26 09:20:38 -07:00

parisc

irq: change ->set_affinity() to return status

2009-04-28 12:21:16 +02:00

powerpc

Merge branch 'linus' into irq/numa

2009-06-01 21:06:21 +02:00

s390

s390: convert to use __HEAD and HEAD_TEXT macros.

2009-04-26 09:20:39 -07:00

sh

flat: fix data sections alignment

2009-05-29 08:40:02 -07:00

sparc

Merge branch 'linus' into irq/numa

2009-06-01 21:06:21 +02:00

um

uml: kill a kconfig warning

2009-04-21 13:41:50 -07:00

x86

Merge branch 'irq/numa' into x86/mce3

2009-06-01 15:25:31 -07:00

xtensa

xtensa: Fix linker script to include .literal sections

2009-05-11 23:40:33 -07:00

.gitignore

…

Kconfig

mutex: have non-spinning mutexes on s390 by default

2009-04-09 19:28:24 +02:00