]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'linus' into perf/core
authorIngo Molnar <mingo@elte.hu>
Mon, 7 Feb 2011 07:44:11 +0000 (08:44 +0100)
committerIngo Molnar <mingo@elte.hu>
Mon, 7 Feb 2011 07:44:26 +0000 (08:44 +0100)
commita984e607fb5a42bbbdbe503fff855a245b0fe1d1
treee71eaf08c5f9179d6fd6c7e08d8539358dc76ad1
parentf3192624deb532aa3a46173fea7057996efe6a55
parent909bbbfd42471969311b1849e1616549c6b8ced1
Merge branch 'linus' into perf/core

Merge reason: Pick up perf fixes that are now upstream

Signed-off-by: Ingo Molnar <mingo@elte.hu>
kernel/perf_event.c
tools/perf/util/evsel.c