Merge branch 'v4.4/topic/coresight' into linux-linaro-lsk-v4.4

author Alex Shi <alex.shi@linaro.org>

Tue, 21 Jun 2016 03:14:16 +0000 (11:14 +0800)

committer Alex Shi <alex.shi@linaro.org>

Tue, 21 Jun 2016 03:14:16 +0000 (11:14 +0800)
author Alex Shi <alex.shi@linaro.org>
Tue, 21 Jun 2016 03:14:16 +0000 (11:14 +0800)
committer Alex Shi <alex.shi@linaro.org>
Tue, 21 Jun 2016 03:14:16 +0000 (11:14 +0800)
diff --cc MAINTAINERS
Simple merge
diff --cc kernel/events/core.c
Simple merge
diff --cc tools/perf/util/evlist.c
Simple merge
diff --cc tools/perf/util/parse-events.c
Simple merge
author	Alex Shi <alex.shi@linaro.org>
	Tue, 21 Jun 2016 03:14:16 +0000 (11:14 +0800)
committer	Alex Shi <alex.shi@linaro.org>
	Tue, 21 Jun 2016 03:14:16 +0000 (11:14 +0800)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/events/core.c	patch \|	diff1 \|	diff2 \|	blob \| history
tools/perf/util/evlist.c	patch \|	diff1 \|	diff2 \|	blob \| history
tools/perf/util/parse-events.c	patch \|	diff1 \|	diff2 \|	blob \| history