projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bb236de 4afc81c)
Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@kernel.org>
Sat, 25 Jan 2014 07:22:49 +0000 (08:22 +0100)
committerIngo Molnar <mingo@kernel.org>
Sat, 25 Jan 2014 07:22:49 +0000 (08:22 +0100)
commit993e5ee67a90c7b6a5dbb61b9c31df2955afff46
tree76a86f597ad07e908d1d6470d7501ecfacbac4f2tree | snapshot
parentbb236de5d9509c1c6ea5ce0680f000002e731ee2commit | diff
parent4afc81cd1caa93daa50c1c29a3ab747c978abc13commit | diff
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>
John Crispins staging tree