tree 94a8d419a470a4f9852ca397bb9bbe48db92ff5c
parent dca2d6ac09d9ef59ff46820d4f0c94b08a671202
parent f39cdf25bf77219676ec5360980ac40b1a7e144a
author Frederic Weisbecker <fweisbec@gmail.com> 1255820949 +0200
committer Frederic Weisbecker <fweisbec@gmail.com> 1255821153 +0200

Merge commit 'perf/core' into perf/hw-breakpoint

Conflicts:
	kernel/Makefile
	kernel/trace/Makefile
	kernel/trace/trace.h
	samples/Makefile

Merge reason: We need to be uptodate with the perf events development
branch because we plan to rewrite the breakpoints API on top of
perf events.