From: Ingo Molnar <mingo@kernel.org>
Date: Sat, 25 Jan 2014 07:22:49 +0000 (+0100)
Subject: Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: firefly_0821_release~176^2~4235^2~34
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=993e5ee67a90c7b6a5dbb61b9c31df2955afff46;p=firefly-linux-kernel-4.4.55.git

Merge tag 'perf-urgent-for-mingo' of git://git./linux/kernel/git/acme/linux into perf/urgent

Pull perf/urgent fixes from Arnaldo Carvalho de Melo:

  * Fix traceevent plugin path definitions (Josh Boyer)

  * Load map before using map->map_ip() (Masami Hiramatsu)

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

993e5ee67a90c7b6a5dbb61b9c31df2955afff46