diff options
author | Mark Brown <broonie@kernel.org> | 2015-01-09 18:23:25 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-01-09 18:23:25 +0000 |
commit | 7368857a8eed5144e56e65713970764ef0f2f0b8 (patch) | |
tree | 2c80643782eb6f3dd18bd672b555781556b0cafc /MAINTAINERS | |
parent | 297e25caff999eeccf24b19e62388450763af15d (diff) | |
parent | 025f8da59f0a0415c9f4033dc010d0607c81b6b3 (diff) |
Merge remote-tracking branch 'lsk/v3.14/topic/coresight' into linux-linaro-lsk-v3.14
Conflicts:
drivers/Makefile
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 4a4296ed9929..c701f48b8e00 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -849,6 +849,14 @@ M: Hubert Feurstein <hubert.feurstein@contec.at> S: Maintained F: arch/arm/mach-ep93xx/micro9.c +ARM/CORESIGHT FRAMEWORK AND DRIVERS +M: Mathieu Poirier <mathieu.poirier@linaro.org> +L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) +S: Maintained +F: drivers/coresight/* +F: Documentation/trace/coresight.txt +F: Documentation/devicetree/bindings/arm/coresight.txt + ARM/CORGI MACHINE SUPPORT M: Richard Purdie <rpurdie@rpsys.net> S: Maintained |