aha/arch/sparc
Thomas Gleixner 521c180874 Merge branch 'core/urgent' into core/futexes
Merge reason: this branch was on an pre -rc1 base, merge it up to -rc6+
              to get the latest upstream fixes.

Conflicts:
	kernel/futex.c

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2009-05-20 09:02:28 +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 Merge branch 'core/urgent' into core/futexes 2009-05-20 09:02:28 +02:00
kernel sparc: cleanup references to deprecated .text.init* sections. 2009-04-27 19:51:58 -07:00
lib sparc64: Fix probe_kernel_{read,write}(). 2009-02-08 22:32:31 -08: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