tree 5554648e4411fcd6909214f71370348567cf4b2d
parent 540804b5c52065a87d826f7714b18a3ec0b269f9
parent 0f940cb7d970f4fd569bb5f9f49774422f2ccbee
author Ingo Molnar <mingo@elte.hu> 1286264834 +0200
committer Ingo Molnar <mingo@elte.hu> 1286264834 +0200

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>