diff options
| author | Mark Brown <broonie@kernel.org> | 2015-01-09 18:22:45 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-01-09 18:22:45 +0000 |
| commit | 2156eda2aafa0b0f660656246a11d7c2a9947ff9 (patch) | |
| tree | 81c2fadeadc2f62e3a03c5fe78b41087d2926233 /MAINTAINERS | |
| parent | bbba26b2fc88c77239ebcd45d7fb669018511dfe (diff) | |
| parent | 312ccd6ab1510724d298ae6c19177e501d6c1ca0 (diff) | |
Merge remote-tracking branch 'lsk/v3.10/topic/coresight' into linux-linaro-lsk
Conflicts:
arch/arm/include/asm/hardware/coresight.h
drivers/Makefile
drivers/of/base.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 7433b84439f..8a8a48b39cd 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -783,6 +783,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 |