Frederic Weisbecker 0f8f86c7bd Merge commit 'perf/core' into perf/hw-breakpoint ...

Conflicts:
	kernel/Makefile
	kernel/trace/Makefile
	kernel/trace/trace.h
	samples/Makefile

Merge reason: We need to be uptodate with the perf events development
branch because we plan to rewrite the breakpoints API on top of
perf events.

2009-10-18 01:12:33 +02:00

..

cpu.c

Merge commit 'perf/core' into perf/hw-breakpoint

2009-10-18 01:12:33 +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