Ingo Molnar 8302294f43 Merge branch 'tracing/core-v2' into tracing-for-linus ...

Conflicts:
	include/linux/slub_def.h
	lib/Kconfig.debug
	mm/slob.c
	mm/slub.c

2009-04-02 00:49:02 +02:00

..

boot

xtensa: move headers files to arch/xtensa/include

2008-11-06 10:25:09 -08:00

configs

…

include/asm

Merge branch 'tracing/core-v2' into tracing-for-linus

2009-04-02 00:49:02 +02:00

kernel

Merge branches 'irq/genirq' and 'linus' into irq/core

2009-03-16 09:20:13 +01:00

lib

xtensa: move headers files to arch/xtensa/include

2008-11-06 10:25:09 -08:00

mm

xtensa: fix compilation somewhat

2009-03-10 15:55:10 -07:00

platforms

proc tty: switch xtensa iss console to ->proc_fops

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

variants

xtensa: move headers files to arch/xtensa/include

2008-11-06 10:25:09 -08:00

Kconfig

xtensa: fix compilation somewhat

2009-03-10 15:55:10 -07:00

Kconfig.debug

…

Makefile

xtensa: move headers files to arch/xtensa/include

2008-11-06 10:25:09 -08:00