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
..
annotate	Merge branch 'linus' into perf/core, to fix conflicts	2017-11-07 10:30:18 +01:00
include	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
util	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
Build	perf build: Add arch s390 objects building	2015-02-12 13:20:59 -03:00
Makefile	perf build: Add arch s390 objects building	2015-02-12 13:20:59 -03:00