From: Ingo Molnar <mingo@elte.hu>
Date: Sat, 4 Jun 2011 10:28:05 +0000 (+0200)
Subject: Merge branch 'perf/urgent' into perf/core
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~17010^2~43
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=3ce2a0bc9dfb6423491afe0afc9f099e24b8cba4;p=mirror_ubuntu-artful-kernel.git

Merge branch 'perf/urgent' into perf/core

Conflicts:
	tools/perf/util/python.c

Merge reason: resolve the conflict with perf/urgent.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

3ce2a0bc9dfb6423491afe0afc9f099e24b8cba4