]> git.baikalelectronics.ru Git - kernel.git/commit
Merge remote-tracking branch 'torvalds/master' into perf/core
authorArnaldo Carvalho de Melo <acme@redhat.com>
Mon, 13 Nov 2017 12:39:12 +0000 (09:39 -0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Mon, 13 Nov 2017 12:39:12 +0000 (09:39 -0300)
commit546014ec2b32bd58f7c0beea264fa6c03cef80a0
treef3a2416c08c7ce46ce72d9fdf55b5a32328164ee
parent55bc3c243abc44be288de093de8a02a0381ffe4f
parent9d3ed24eee0f71118211e4821b6ec6bfecfd73d2
Merge remote-tracking branch 'torvalds/master' into perf/core

To pick up fixes.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/builtin-trace.c
tools/perf/util/parse-events.l