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)
commit7862edc4191123f9c7e7ec0a7b356d332a61c41e
treef3a2416c08c7ce46ce72d9fdf55b5a32328164ee
parentfcdfafcb73be8fa45909327bbddca46fb362a675
parent516fb7f2e73dcc303fb97fc3593209fcacf2d982
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