tree 5742641092ce64227dd2086d78baaede57da1f80
parent 7df01d96b295e400167e78061b81d4c91630b12d
parent 0fdf13606b67f830559abdaad15980c7f4f05ec4
author Robert Richter <robert.richter@amd.com> 1287139500 +0200
committer Robert Richter <robert.richter@amd.com> 1287139500 +0200

Merge remote branch 'tip/perf/core' into oprofile/core

Conflicts:
	arch/arm/oprofile/common.c
	kernel/perf_event.c