Merge commit 'v2.6.32-rc5' into perf/probes
authorIngo Molnar <mingo@elte.hu>
Sat, 17 Oct 2009 07:58:25 +0000 (09:58 +0200)
committerIngo Molnar <mingo@elte.hu>
Sat, 17 Oct 2009 07:58:25 +0000 (09:58 +0200)
commitbb3c3e807140816b5f5fd4840473ee52a916ad4f
tree9e8a69d266a7df86ca16177eefffab4b4e910753
parent595c36490deb49381dc51231a3d5e6b66786ed27
parent012abeea669ea49636cf952d13298bb68654146a
Merge commit 'v2.6.32-rc5' into perf/probes

Conflicts:
kernel/trace/trace_event_profile.c

Merge reason: update to -rc5 and resolve conflict.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/Makefile
arch/x86/lib/Makefile
arch/x86/mm/fault.c
kernel/kprobes.c
kernel/trace/trace_event_profile.c
kernel/trace/trace_events.c
kernel/trace/trace_syscalls.c
tools/perf/Makefile