Ingo Molnar 3d58f48ba0 Merge branch 'linus' into irq/numa ...

Conflicts:
	arch/mips/sibyte/bcm1480/irq.c
	arch/mips/sibyte/sb1250/irq.c

Merge reason: we gathered a few conflicts plus update to latest upstream fixes.

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

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

..

boot

sparc,sparc64: unify boot/

2008-12-04 09:17:21 -08:00

configs

sparc32: Update defconfig.

2009-04-17 04:05:06 -07:00

include/asm

sparc64: Fix SET_PERSONALITY to not clip bits outside of PER_MASK.

2009-05-07 15:36:13 -07:00

kernel

Merge branch 'x86/apic' into irq/numa

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

lib

sparc64: Fix section attribute warnings.

2009-05-29 16:12:02 -07:00

math-emu

sparc64: unify math-emu

2008-12-04 09:16:56 -08:00

mm

sparc64: add_node_ranges() must be __init

2009-04-08 03:37:35 -07:00

oprofile

sparc64: Implement NMI watchdog on capable cpus.

2009-01-30 00:03:53 -08:00

prom

sparc: Eliminate PROMLIB_INTERNAL as it does nothing

2009-01-08 16:59:01 -08:00

Kconfig

generic debug pagealloc

2009-04-01 08:59:13 -07:00

Kconfig.debug

generic debug pagealloc: build fix

2009-04-02 19:04:48 -07:00

Makefile

sparc: unify kernel/init_task

2008-12-04 13:28:09 -08:00