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)
commit00e8976200665eec2fa9264d61885b4d1384d4f0
tree5554648e4411fcd6909214f71370348567cf4b2d
parent540804b5c52065a87d826f7714b18a3ec0b269f9
parent0f940cb7d970f4fd569bb5f9f49774422f2ccbee
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