]> 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)
commite5765b0572b7aff03fa357323e3c46eff68056ab
treef3a2416c08c7ce46ce72d9fdf55b5a32328164ee
parent2ec61abacbb9668513d62e3b3f53f8258eb08bb0
parent2867846bbcd1b0856968b43758ebc6f52f1ff1e2
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