Merge remote-tracking branch 'torvalds/master' into perf/core

Minor conflict in tools/perf/arch/arm/util/auxtrace.c as one fix there
was cherry-picked for the last perf/urgent pull req to Linus, so was
already there.

Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>

diff --cc tools/lib/traceevent/event-parse.c
Simple merge

diff --cc tools/lib/traceevent/plugins/Makefile
Simple merge