From: Ingo Molnar Date: Thu, 21 Mar 2013 10:06:12 +0000 (+0100) Subject: Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: omap-for-v3.10/dt-fixes-for-merge-window~119^2~16 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a11953851213fd1d3eebcb68b4a537d458c70c2;p=pandora-kernel.git Merge tag 'perf-core-for-mingo' of git://git./linux/kernel/git/acme/linux into perf/core Conflicts: tools/Makefile Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo: . Honor parallel jobs, fix from Borislav Petkov . Introduce tools/lib/lk library, initially just removing duplication among tools/perf and tools/vm. from Borislav Petkov . Fix build on non-glibc systems due to libio.h absence, from Cody P Schafer. . Remove some perf_session and tracing dead code, from David Ahern. . Introduce perf stat --repeat forever, from Frederik Deweerdt. . Add perf test entries for checking --cpu in record and stat, from Jiri Olsa. . Add perf test entries for checking breakpoint overflow signal handler issues, from Jiri Olsa. . Add perf test entry for for checking number of EXIT events, from Namhyung Kim. . Simplify some perf_evlist methods and to allow 'stat' to share code with 'record' and 'trace'. . Remove dead code in related to libtraceevent integration, from Namhyung Kim. . Event group view for 'annotate' in --stdio, --tui and --gtk, from Namhyung Kim. Signed-off-by: Arnaldo Carvalho de Melo [ resolved the trivial merge conflict with upstream ] Signed-off-by: Ingo Molnar --- 0a11953851213fd1d3eebcb68b4a537d458c70c2 Reading git-diff-tree failed