]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'perf/urgent' into perf/core
authorIngo Molnar <mingo@elte.hu>
Tue, 5 Oct 2010 07:47:14 +0000 (09:47 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 5 Oct 2010 07:47:14 +0000 (09:47 +0200)
commitc50db1704188e2e080edfdd7b149cd42b8d6aaaf
tree5554648e4411fcd6909214f71370348567cf4b2d
parentf573f461cdc6a1dc484bf21d6438b89f4fb83d6a
parenta5d72eb49af9c1ab504c9bd16b9dcd3ad7b35c30
Merge branch 'perf/urgent' into perf/core

Conflicts:
tools/perf/util/ui/browsers/hists.c

Merge reason: fix the conflict and merge in changes for dependent patch.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/arm/oprofile/common.c
arch/x86/kernel/Makefile
arch/x86/kernel/cpu/perf_event.c
arch/x86/kernel/cpu/perf_event_p4.c
tools/perf/Makefile