Ingo Molnar a1922ed661 Merge branch 'tracing/core' into tracing/hw-breakpoints ... Conflicts: arch/Kconfig kernel/trace/trace.h Merge reason: resolve the conflicts, plus adopt to the new ring-buffer APIs. Signed-off-by: Ingo Molnar <mingo@elte.hu>		2009-09-07 08:19:51 +02:00
..
cpu.c	Merge branch 'tracing/core' into tracing/hw-breakpoints	2009-09-07 08:19:51 +02:00
hibernate_32.c	x86, hibernate: fix breakage on x86_32 with CONFIG_NUMA set	2008-11-12 23:28:51 +01:00
hibernate_64.c	pm: rework includes, remove arch ifdefs	2009-04-01 08:59:16 -07:00
hibernate_asm_32.S	x86: use _types.h headers in asm where available	2009-02-13 11:35:01 -08:00
hibernate_asm_64.S	x86: use _types.h headers in asm where available	2009-02-13 11:35:01 -08:00
Makefile	x86: Fix resume from suspend when CONFIG_CC_STACKPROTECTOR	2009-07-08 13:20:13 +02:00