From: Arnaldo Carvalho de Melo <acme@redhat.com>
Date: Fri, 11 Feb 2011 13:45:54 +0000 (-0200)
Subject: Merge remote branch 'acme/perf/urgent' into perf/core
X-Git-Tag: v2.6.39-rc1~510^2~77^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c940c18c57e45910f7dd9a4011c4658cacba4b6;p=pandora-kernel.git

Merge remote branch 'acme/perf/urgent' into perf/core

Fixups due to rename of event_t routines from event__ to perf_event__
done in perf/core.

Conflicts:
	tools/perf/builtin-record.c
	tools/perf/builtin-top.c
	tools/perf/util/event.c
	tools/perf/util/event.h

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---

7c940c18c57e45910f7dd9a4011c4658cacba4b6
Reading git-diff-tree failed