Merge branch 'perfcounters/urgent' into perfcounters/core
authorIngo Molnar <mingo@elte.hu>
Sat, 15 Aug 2009 10:06:12 +0000 (12:06 +0200)
committerIngo Molnar <mingo@elte.hu>
Sat, 15 Aug 2009 10:06:12 +0000 (12:06 +0200)
commitbe750231ce1599b86fbba213e3da8344ece262e2
treea506c461082692bb5bab8b9bb63a762816329454
parent18408ddc01136f505ae357c03f0d8e50b10e0db6
parent39e6dd73502f64e2ae3236b304e160ae30de9384
Merge branch 'perfcounters/urgent' into perfcounters/core

Conflicts:
kernel/perf_counter.c

Merge reason: update to latest upstream (-rc6) and resolve
              the conflict with urgent fixes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/cpu/perf_counter.c
tools/perf/Makefile
tools/perf/builtin-record.c
tools/perf/builtin-report.c
tools/perf/util/symbol.c
tools/perf/util/symbol.h