linux/tools/perf/arch
Ingo Molnar 15bcdc9477 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>
2017-11-07 10:30:18 +01:00
..
alpha
arm Merge branch 'linus' into perf/core, to fix conflicts 2017-11-07 10:30:18 +01:00
arm64 Merge branch 'linus' into perf/core, to fix conflicts 2017-11-07 10:30:18 +01:00
mips
parisc
powerpc Merge branch 'linus' into perf/core, to fix conflicts 2017-11-07 10:30:18 +01:00
s390 Merge branch 'linus' into perf/core, to fix conflicts 2017-11-07 10:30:18 +01:00
sh License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
sparc License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
x86 Merge branch 'linus' into perf/core, to fix conflicts 2017-11-07 10:30:18 +01:00
xtensa License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
Build perf tools: Fix build with ARCH=x86_64 2017-06-14 15:44:29 -03:00
common.c License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
common.h License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00