From: Ingo Molnar <mingo@kernel.org>
Date: Sat, 8 Dec 2012 14:25:06 +0000 (+0100)
Subject: Merge branch 'linus' into perf/core
X-Git-Tag: omap-for-v3.8/fixes-for-merge-window-v4-signed~77^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f0b9abfb044649bc452fb2fb975ff2fd599cc6a3;p=pandora-kernel.git

Merge branch 'linus' into perf/core

Conflicts:
	tools/perf/Makefile
	tools/perf/builtin-test.c
	tools/perf/perf.h
	tools/perf/tests/parse-events.c
	tools/perf/util/evsel.h

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

f0b9abfb044649bc452fb2fb975ff2fd599cc6a3
Reading git-diff-tree failed