Ingo Molnar fc6fc7f1b1 Merge branch 'linus' into x86/apic ...

Conflicts:
	arch/x86/mach-default/setup.c

Semantic conflict resolution:
	arch/x86/kernel/setup.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

2009-02-22 20:05:19 +01:00

..

alpha

Merge branch 'linus' into x86/apic

2009-02-22 20:05:19 +01:00

arm

Merge branch 'linus' into x86/apic

2009-02-22 20:05:19 +01:00

avr32

Merge branch 'linus' into x86/apic

2009-02-22 20:05:19 +01:00

blackfin

Merge branch 'core/header-fixes' into x86/headers

2009-02-13 21:05:03 +01:00

cris

Merge branch 'syscalls' of git://git390.osdl.marist.edu/pub/scm/linux-2.6

2009-01-14 19:58:40 -08:00

frv

FRV: in_interrupt() requires #inclusion of linux/hardirq.h not asm/hardirq.h now

2009-02-09 08:51:35 -08:00

h8300

headers_check fix: h8300, swab.h

2009-02-01 11:01:24 +05:30

ia64

Merge branch 'linus' into x86/apic

2009-02-22 20:05:19 +01:00

m32r

eeprom: More consistent symbol names

2009-01-26 21:19:57 +01:00

m68k

m68k: atari - Rename "mfp" to "st_mfp"

2009-02-22 09:23:02 -08:00

m68knommu

m68knommu: fix 5329 ColdFire periphal addressing

2009-01-27 16:42:03 +10:00

mips

Merge branch 'core/header-fixes' into x86/headers

2009-02-13 21:05:03 +01:00

mn10300

Merge branch 'linus' into x86/apic

2009-02-22 20:05:19 +01:00

parisc

Merge branch 'core/header-fixes' into x86/headers

2009-02-13 21:05:03 +01:00

powerpc

Merge branch 'linus' into x86/apic

2009-02-22 20:05:19 +01:00

s390

[S390] fix "mem=" handling in case of standby memory

2009-02-19 15:19:19 +01:00

sh

sh: Fix up T-bit error handling in SH-4A mutex fastpath.

2009-01-29 11:56:03 +09:00

sparc

Merge branch 'linus' into x86/apic

2009-02-13 09:44:22 +01:00

um

uml: fix vde network backend in user mode linux

2009-02-20 17:57:48 -08:00

x86

Merge branch 'linus' into x86/apic

2009-02-22 20:05:19 +01:00

xtensa

headers_check fix: xtensa, swab.h

2009-02-01 11:01:30 +05:30

.gitignore

…

Kconfig

[CVE-2009-0029] System call wrapper infrastructure

2009-01-14 14:15:16 +01:00