tree e1e3c1f2b89e3a705d1737d61a4d8a9394a1930e
parent 340b5319c98eb14f7a70947a38e17d06f5beea88
parent e4880bc5dfb1f02b152e62a894b5c6f3e995b3cf
author Ingo Molnar <mingo@kernel.org> 1510047018 +0100
committer Ingo Molnar <mingo@kernel.org> 1510047018 +0100

Merge branch 'linus' into perf/core, to fix conflicts

Conflicts:
	tools/perf/arch/arm/annotate/instructions.c
	tools/perf/arch/arm64/annotate/instructions.c
	tools/perf/arch/powerpc/annotate/instructions.c
	tools/perf/arch/s390/annotate/instructions.c
	tools/perf/arch/x86/tests/intel-cqm.c
	tools/perf/ui/tui/progress.c
	tools/perf/util/zlib.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>