]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 904d3bd 8c5f1fc)
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)
commit632a72e31b3682f32609f090c52b55632a8f056d
tree76a86f597ad07e908d1d6470d7501ecfacbac4f2tree | snapshot
parent904d3bdec0daeaa1cb2978e628485dc5e0311136commit | diff
parent8c5f1fc8c5fb12a217f9d2065e6e8f5e7795de90commit | diff
Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/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>
Linux Kernel Source Tree.