David S. Miller 9343af084c Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ ...

Conflicts:
	lib/Kconfig.debug

2010-04-13 00:28:45 -07:00

..

boot

arch/sparc/boot/*.c: Mark various internal functions static

2009-11-15 15:01:40 -08:00

configs

sparc64: Update defconfig.

2010-04-03 16:18:32 -07:00

include/asm

sparc64: Use a seperate counter for timer interrupts and NMI checks, like x86.

2010-04-12 22:37:07 -07:00

kernel

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

2010-04-13 00:28:45 -07:00

lib

sparc64: Add function graph tracer support.

2010-04-12 22:37:26 -07:00

math-emu

sparc: Add alignment and emulation fault perf events.

2009-12-11 01:07:53 -08:00

mm

Merge branch 'master' into export-slabh

2010-04-05 11:37:28 +09:00

oprofile

sparc: using HZ needs an include of linux/param.h

2009-10-05 00:46:08 -07:00

prom

sparc64: Make prom entry spinlock NMI safe.

2010-03-03 09:06:03 -08:00

Kconfig

sparc64: Add function graph tracer support.

2010-04-12 22:37:26 -07:00

Kconfig.debug

sparc64: Kill CONFIG_STACK_DEBUG code.

2010-04-12 22:36:03 -07:00

Makefile

sparc: Set UTS_MACHINE correctly.

2009-12-05 17:17:55 -08:00